Merge branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/684faa97 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/684faa97 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/684faa97 Branch: refs/heads/master Commit: 684faa97dca2042d4d9e42d8aa920d8ca96ad1b3 Parents: cba1364 91d2a91 Author: Robert Walsh <[email protected]> Authored: Tue Feb 16 12:51:24 2016 -0600 Committer: Robert Walsh <[email protected]> Committed: Tue Feb 16 12:51:24 2016 -0600 ---------------------------------------------------------------------- tests/integration/test/main.js | 6 +++--- tests/integration/test/teardown.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
