You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/12/18 18:36:30 UTC

[1/4] incubator-guacamole-server git commit: GUACAMOLE-143: Include DISCLAIMER and NOTICE within source .tar.gz.

Repository: incubator-guacamole-server
Updated Branches:
  refs/heads/staging/0.9.10-incubating 78e6215cb -> bb1310533


GUACAMOLE-143: Include DISCLAIMER and NOTICE within source .tar.gz.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/c61037c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/c61037c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/c61037c4

Branch: refs/heads/staging/0.9.10-incubating
Commit: c61037c4a68e14a1924ac4399e8b9c92054ffab4
Parents: 78e6215
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Dec 17 20:59:57 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Dec 17 20:59:57 2016 -0800

----------------------------------------------------------------------
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/c61037c4/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index bf1fac1..715c9dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,9 @@ SUBDIRS += src/guacenc
 endif
 
 EXTRA_DIST =     \
+    DISCLAIMER   \
     LICENSE      \
+    NOTICE       \
     bin/guacctl  \
     doc/Doxyfile
 


[3/4] incubator-guacamole-server git commit: GUACAMOLE-143: Include guacd-docker within source .tar.gz.

Posted by jm...@apache.org.
GUACAMOLE-143: Include guacd-docker within source .tar.gz.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6101be62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6101be62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6101be62

Branch: refs/heads/staging/0.9.10-incubating
Commit: 6101be6234a4c3c37754d37a98a45b02926e1cfe
Parents: 2a55474
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Dec 17 21:15:13 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Dec 17 21:15:13 2016 -0800

----------------------------------------------------------------------
 Makefile.am | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/6101be62/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 8489012..54899e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,11 +70,14 @@ if ENABLE_GUACENC
 SUBDIRS += src/guacenc
 endif
 
-EXTRA_DIST =     \
-    CONTRIBUTING \
-    DISCLAIMER   \
-    LICENSE      \
-    NOTICE       \
-    bin/guacctl  \
-    doc/Doxyfile
+EXTRA_DIST =      \
+    .dockerignore \
+    CONTRIBUTING  \
+    DISCLAIMER    \
+    Dockerfile    \
+    LICENSE       \
+    NOTICE        \
+    bin/guacctl   \
+    doc/Doxyfile  \
+    src/guacd-docker
 


[2/4] incubator-guacamole-server git commit: GUACAMOLE-143: Include CONTRIBUTING within source .tar.gz.

Posted by jm...@apache.org.
GUACAMOLE-143: Include CONTRIBUTING within source .tar.gz.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/2a55474c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/2a55474c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/2a55474c

Branch: refs/heads/staging/0.9.10-incubating
Commit: 2a55474c92145f0fbfac6e2cbfeff9e1d1d40671
Parents: c61037c
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Dec 17 21:09:17 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Dec 17 21:09:17 2016 -0800

----------------------------------------------------------------------
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/2a55474c/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 715c9dd..8489012 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,7 @@ SUBDIRS += src/guacenc
 endif
 
 EXTRA_DIST =     \
+    CONTRIBUTING \
     DISCLAIMER   \
     LICENSE      \
     NOTICE       \


[4/4] incubator-guacamole-server git commit: GUACAMOLE-143: Merge fix for missing files in server artifact.

Posted by jm...@apache.org.
GUACAMOLE-143: Merge fix for missing files in server artifact.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/bb131053
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/bb131053
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/bb131053

Branch: refs/heads/staging/0.9.10-incubating
Commit: bb13105338a23acf96bcc99dcc5499ab72aa21e9
Parents: 78e6215 6101be6
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Dec 18 10:30:34 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Dec 18 10:30:34 2016 -0800

----------------------------------------------------------------------
 Makefile.am | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------