Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLIENTS-287 add tools/ submodule #22

Merged
merged 5 commits into from
Mar 25, 2015
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "tools"]
path = tools
url = git://github.com/basho/riak-client-tools
26 changes: 26 additions & 0 deletions buildbot/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
TOPDIR = $(realpath $(CURDIR)/..)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is changing in clients-288


TOOLS_DIR = $(TOPDIR)/tools/devrel
RIAK_CONF = $(RIAK_DIR)/etc/riak.conf
ADV_CONF = $(RIAK_DIR)/etc/advanced.config
RIAK_ADMIN = $(RIAK_DIR)/bin/riak-admin

preconfigure:
$(TOOLS_DIR)/gen-riak-conf $(RIAK_CONF) 8098 8087
$(TOOLS_DIR)/strong-consistency-conf $(RIAK_CONF)
$(TOOLS_DIR)/gen-adv-conf $(ADV_CONF)

configure:
$(TOOLS_DIR)/riak-cluster-config $(RIAK_ADMIN) 8098 true false

compile: install-deps debug

lint:
grunt jshint

setup-integration:
echo 'Nothing to do!'

test:
grunt

1 change: 1 addition & 0 deletions tools
Submodule tools added at 5eb97e
89 changes: 0 additions & 89 deletions tools/test-ca/README.md

This file was deleted.

22 changes: 0 additions & 22 deletions tools/test-ca/certs/cacert.pem

This file was deleted.

82 changes: 0 additions & 82 deletions tools/test-ca/certs/riak-test-cert.pem

This file was deleted.

82 changes: 0 additions & 82 deletions tools/test-ca/certs/riakuser-client-cert.pem

This file was deleted.

Binary file removed tools/test-ca/certs/riakuser-client-cert.pfx
Binary file not shown.