Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4573475a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4573475a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4573475a Branch: refs/heads/master Commit: 4573475aa548dd8e2078de06ac9b15f631560162 Parents: 7458c91 68061b0 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Mar 12 17:05:55 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Mar 12 17:05:55 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- LICENSE.txt | 2 +- modules/core/licenses/snaptree-bsd-license.txt | 35 ++++++++++++++ modules/core/licenses/snaptree-license.txt | 35 -------------- modules/core/licenses/sun-bcl-license.txt | 50 -------------------- .../processors/rest/GridRestCommand.java | 8 +--- .../processors/rest/GridRestProcessor.java | 2 - 7 files changed, 38 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4573475a/LICENSE.txt ---------------------------------------------------------------------- diff --cc LICENSE.txt index fb1ada6,185cf44..185cf44 mode 100644,100755..100644 --- a/LICENSE.txt +++ b/LICENSE.txt
