You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/20 18:28:39 UTC

[1/3] storm git commit: ignore subproject .classpath & .project file

Repository: storm
Updated Branches:
  refs/heads/master 56532a014 -> 09574884c


ignore subproject .classpath & .project file

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/527ad0e1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/527ad0e1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/527ad0e1

Branch: refs/heads/master
Commit: 527ad0e16b08e8dfb465abc78da2c65cd79e5c76
Parents: 90e4f3e
Author: Xin Wang <be...@163.com>
Authored: Sun Jan 17 17:41:46 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Sun Jan 17 17:41:46 2016 +0800

----------------------------------------------------------------------
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/527ad0e1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4b4c52f..08b217a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,5 @@ dependency-reduced-pom.xml
 derby.log
 metastore_db
 .settings/
-**/.project
-**/.classpath
+.project
+.classpath

[2/3] storm git commit: Merge branch 'STORM-1484' of https://github.com/vesense/storm into STORM-1484

Posted by bo...@apache.org.
Merge branch 'STORM-1484' of https://github.com/vesense/storm into STORM-1484

STORM-1484: ignore subproject .classpath & .project file


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3d7688ff
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3d7688ff
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3d7688ff

Branch: refs/heads/master
Commit: 3d7688ff42677c469e69400ae07bc51c26e39deb
Parents: 56532a0 527ad0e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 20 11:26:48 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 20 11:26:48 2016 -0600

----------------------------------------------------------------------
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------

[3/3] storm git commit: Added STORM-1484 to Changelog

Posted by bo...@apache.org.
Added STORM-1484 to Changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/09574884
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/09574884
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/09574884

Branch: refs/heads/master
Commit: 09574884c57966936993f612776341a8d72376dd
Parents: 3d7688f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 20 11:28:07 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 20 11:28:07 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/09574884/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5cdb3d..3b78993 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1484: ignore subproject .classpath & .project file
 
 ## 1.0.0
  * STORM-1472: Fix the errorTime bug and show the time to be readable