Merge remote-tracking branch 'johnament/USERGRID-246' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ae967780 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ae967780 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ae967780 Branch: refs/heads/master Commit: ae96778002cf1dc5979f0d67cceff76050d487a5 Parents: a89c57b 93bff8b Author: Rod Simpson <[email protected]> Authored: Wed Nov 12 14:46:06 2014 -0700 Committer: Rod Simpson <[email protected]> Committed: Wed Nov 12 14:46:06 2014 -0700 ---------------------------------------------------------------------- .gitignore | 3 ++- portal/config.js | 2 +- stack/build-tools/pom.xml | 2 +- stack/config/pom.xml | 2 +- stack/core/pom.xml | 2 +- stack/java-sdk-old/pom.xml | 2 +- stack/launcher/pom.xml | 2 +- stack/mongo-emulator/pom.xml | 2 +- stack/pom.xml | 2 +- stack/rest/pom.xml | 2 +- stack/services/pom.xml | 2 +- stack/test-utils/pom.xml | 2 +- stack/tools/pom.xml | 2 +- stack/websocket/pom.xml | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
