Merge pull request #31 from basho-labs/2.0.0-rc2

2.0.0 rc2
basho-labs · Dec 20, 2016 · a1af1e7 · a1af1e7
2 parents ce7a6b6 + 9e9563b
commit a1af1e7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/framework/riak-mesos-scheduler b/framework/riak-mesos-scheduler
diff --git a/framework/riak_explorer b/framework/riak_explorer
diff --git a/tools/riak-mesos-dcos-repo b/tools/riak-mesos-dcos-repo
diff --git a/tools/riak-mesos-tools b/tools/riak-mesos-tools
+1 −1		README.md
+4,687 −0		priv/ember_riak_explorer/dist/assets/ember-riak-explorer.css
+199 −0		priv/ember_riak_explorer/dist/assets/ember-riak-explorer.css.map
+43,673 −0		priv/ember_riak_explorer/dist/assets/ember-riak-explorer.js
+1 −0		priv/ember_riak_explorer/dist/assets/ember-riak-explorer.map
+ −		priv/ember_riak_explorer/dist/assets/failed.png
+ −		priv/ember_riak_explorer/dist/assets/images/ajax-loading-big.gif
+ −		priv/ember_riak_explorer/dist/assets/images/riak.png
+ −		priv/ember_riak_explorer/dist/assets/images/sample_logo.png
+ −		priv/ember_riak_explorer/dist/assets/passed.png
+99 −0		priv/ember_riak_explorer/dist/assets/test-loader.js
+321 −0		priv/ember_riak_explorer/dist/assets/test-support.css
+8,288 −0		priv/ember_riak_explorer/dist/assets/test-support.js
+1 −0		priv/ember_riak_explorer/dist/assets/test-support.map
+3,140 −0		priv/ember_riak_explorer/dist/assets/tests.js
+1 −0		priv/ember_riak_explorer/dist/assets/tests.map
+587 −0		priv/ember_riak_explorer/dist/assets/vendor.css
+146,247 −0		priv/ember_riak_explorer/dist/assets/vendor.js
+1 −0		priv/ember_riak_explorer/dist/assets/vendor.map
+5 −5		priv/ember_riak_explorer/dist/index.html
+19 −0		priv/ember_riak_explorer/dist/testem.js
+44 −0		priv/ember_riak_explorer/dist/tests/index.html
+1 −1		README.md
+4 −4		repo/packages/R/riak/2/config.json
+1 −1		repo/packages/R/riak/2/package.json
+2 −2		repo/packages/R/riak/2/resource.json
+3 −3		config/config.dcos.json
+3 −3		config/config.dcos.template.json
+5 −5		config/config.example.json
+3 −3		config/config.template.json