You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ph...@apache.org on 2016/08/03 23:17:03 UTC
[2/3] incubator-juneau git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/e52628ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/e52628ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/e52628ca
Branch: refs/heads/master
Commit: e52628cab60a28eb226a9ae64bb806abf5649103
Parents: 076a344 79d1949
Author: Peter Haumer <ph...@us.ibm.com>
Authored: Wed Aug 3 15:42:53 2016 -0700
Committer: Peter Haumer <ph...@us.ibm.com>
Committed: Wed Aug 3 15:42:53 2016 -0700
----------------------------------------------------------------------
.gitignore | 2 +
org.apache.juneau.distrib/pom.xml | 1 +
.../META-INF/MANIFEST.MF | 4 +-
.../build.properties | 17 +
.../build.xml | 57 ++
.../nls/AddressBookResource.properties | 74 --
.../server/samples/htdocs/code-highlighting.css | 124 ---
.../samples/nls/AtomFeedResource.properties | 21 -
.../nls/CodeFormatterResource.properties | 18 -
.../samples/nls/HelloWorldResource.properties | 19 -
.../samples/nls/JsonSchemaResource.properties | 20 -
.../nls/MethodExampleResource.properties | 37 -
.../samples/nls/PhotosResource.properties | 24 -
.../samples/nls/RequestEchoResource.properties | 19 -
.../server/samples/nls/RootResources.properties | 18 -
.../nls/SampleRemoteableServlet.properties | 17 -
.../samples/nls/SourceResource.properties | 19 -
.../samples/nls/SqlQueryResource.properties | 19 -
.../samples/nls/TempDirResource.properties | 18 -
.../samples/nls/TumblrParserResource.properties | 19 -
.../nls/UrlEncodedFormResource.properties | 22 -
.../src/main/resources/averycutedog.jpg | Bin 40879 -> 0 bytes
.../nls/AddressBookResource.properties | 74 ++
.../juneau/server/samples/averycutedog.jpg | Bin 0 -> 40879 bytes
.../server/samples/htdocs/code-highlighting.css | 124 +++
.../samples/nls/AtomFeedResource.properties | 21 +
.../nls/CodeFormatterResource.properties | 18 +
.../samples/nls/HelloWorldResource.properties | 19 +
.../samples/nls/JsonSchemaResource.properties | 20 +
.../nls/MethodExampleResource.properties | 37 +
.../samples/nls/PhotosResource.properties | 24 +
.../samples/nls/RequestEchoResource.properties | 19 +
.../server/samples/nls/RootResources.properties | 18 +
.../nls/SampleRemoteableServlet.properties | 17 +
.../samples/nls/SourceResource.properties | 19 +
.../samples/nls/SqlQueryResource.properties | 19 +
.../samples/nls/TempDirResource.properties | 18 +
.../samples/nls/TumblrParserResource.properties | 19 +
.../nls/UrlEncodedFormResource.properties | 22 +
org.apache.juneau.server/.classpath | 1 +
.../.settings/org.eclipse.wst.common.component | 1 +
org.apache.juneau.server/build.properties | 3 +-
.../server/htdocs/MethodExampleResource1.png | Bin 12276 -> 0 bytes
.../org/apache/juneau/server/htdocs/javadoc.css | 782 -------------------
.../server/labels/nls/DefaultLabels.properties | 41 -
.../org/apache/juneau/server/styles/devops.css | 203 -----
.../org/apache/juneau/server/styles/juneau.css | 142 ----
.../server/htdocs/MethodExampleResource1.png | Bin 0 -> 12276 bytes
.../org/apache/juneau/server/htdocs/javadoc.css | 782 +++++++++++++++++++
.../server/labels/nls/DefaultLabels.properties | 41 +
.../org/apache/juneau/server/styles/devops.css | 203 +++++
.../org/apache/juneau/server/styles/juneau.css | 142 ++++
.../main/java/org/apache/juneau/BeanMap.java | 63 +-
.../main/java/org/apache/juneau/BeanMeta.java | 14 +-
.../org/apache/juneau/BeanPropertyMeta.java | 10 +-
.../org/apache/juneau/BeanPropertyValue.java | 72 ++
.../org/apache/juneau/html/HtmlSerializer.java | 33 +-
.../apache/juneau/internal/DelegateBeanMap.java | 20 +
.../org/apache/juneau/jena/RdfSerializer.java | 22 +-
.../org/apache/juneau/json/JsonSerializer.java | 28 +-
.../juneau/msgpack/MsgPackSerializer.java | 53 +-
.../juneau/urlencoding/UonSerializer.java | 27 +-
.../urlencoding/UrlEncodingSerializer.java | 27 +-
.../org/apache/juneau/utils/MessageBundle.java | 2 +-
.../org/apache/juneau/xml/XmlSerializer.java | 58 +-
.../test/java/org/apache/juneau/CT_BeanMap.java | 13 +-
66 files changed, 1993 insertions(+), 1847 deletions(-)
----------------------------------------------------------------------
Re: [2/3] incubator-juneau git commit: Merge remote-tracking branch 'origin/master'
Posted by "John D. Ament" <jo...@apache.org>.
Generally speak, git users hate merge commits. I don't specifically hate
them, but if you want, you can do a git pull --rebase which basically
reapplies your commits on top of what's available in the remote. It
creates a more linear history.
John
On Wed, Aug 3, 2016 at 7:17 PM <ph...@apache.org> wrote:
> Merge remote-tracking branch 'origin/master'
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/e52628ca
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/e52628ca
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/e52628ca
>
> Branch: refs/heads/master
> Commit: e52628cab60a28eb226a9ae64bb806abf5649103
> Parents: 076a344 79d1949
> Author: Peter Haumer <ph...@us.ibm.com>
> Authored: Wed Aug 3 15:42:53 2016 -0700
> Committer: Peter Haumer <ph...@us.ibm.com>
> Committed: Wed Aug 3 15:42:53 2016 -0700
>
> ----------------------------------------------------------------------
> .gitignore | 2 +
> org.apache.juneau.distrib/pom.xml | 1 +
> .../META-INF/MANIFEST.MF | 4 +-
> .../build.properties | 17 +
> .../build.xml | 57 ++
> .../nls/AddressBookResource.properties | 74 --
> .../server/samples/htdocs/code-highlighting.css | 124 ---
> .../samples/nls/AtomFeedResource.properties | 21 -
> .../nls/CodeFormatterResource.properties | 18 -
> .../samples/nls/HelloWorldResource.properties | 19 -
> .../samples/nls/JsonSchemaResource.properties | 20 -
> .../nls/MethodExampleResource.properties | 37 -
> .../samples/nls/PhotosResource.properties | 24 -
> .../samples/nls/RequestEchoResource.properties | 19 -
> .../server/samples/nls/RootResources.properties | 18 -
> .../nls/SampleRemoteableServlet.properties | 17 -
> .../samples/nls/SourceResource.properties | 19 -
> .../samples/nls/SqlQueryResource.properties | 19 -
> .../samples/nls/TempDirResource.properties | 18 -
> .../samples/nls/TumblrParserResource.properties | 19 -
> .../nls/UrlEncodedFormResource.properties | 22 -
> .../src/main/resources/averycutedog.jpg | Bin 40879 -> 0 bytes
> .../nls/AddressBookResource.properties | 74 ++
> .../juneau/server/samples/averycutedog.jpg | Bin 0 -> 40879 bytes
> .../server/samples/htdocs/code-highlighting.css | 124 +++
> .../samples/nls/AtomFeedResource.properties | 21 +
> .../nls/CodeFormatterResource.properties | 18 +
> .../samples/nls/HelloWorldResource.properties | 19 +
> .../samples/nls/JsonSchemaResource.properties | 20 +
> .../nls/MethodExampleResource.properties | 37 +
> .../samples/nls/PhotosResource.properties | 24 +
> .../samples/nls/RequestEchoResource.properties | 19 +
> .../server/samples/nls/RootResources.properties | 18 +
> .../nls/SampleRemoteableServlet.properties | 17 +
> .../samples/nls/SourceResource.properties | 19 +
> .../samples/nls/SqlQueryResource.properties | 19 +
> .../samples/nls/TempDirResource.properties | 18 +
> .../samples/nls/TumblrParserResource.properties | 19 +
> .../nls/UrlEncodedFormResource.properties | 22 +
> org.apache.juneau.server/.classpath | 1 +
> .../.settings/org.eclipse.wst.common.component | 1 +
> org.apache.juneau.server/build.properties | 3 +-
> .../server/htdocs/MethodExampleResource1.png | Bin 12276 -> 0 bytes
> .../org/apache/juneau/server/htdocs/javadoc.css | 782 -------------------
> .../server/labels/nls/DefaultLabels.properties | 41 -
> .../org/apache/juneau/server/styles/devops.css | 203 -----
> .../org/apache/juneau/server/styles/juneau.css | 142 ----
> .../server/htdocs/MethodExampleResource1.png | Bin 0 -> 12276 bytes
> .../org/apache/juneau/server/htdocs/javadoc.css | 782 +++++++++++++++++++
> .../server/labels/nls/DefaultLabels.properties | 41 +
> .../org/apache/juneau/server/styles/devops.css | 203 +++++
> .../org/apache/juneau/server/styles/juneau.css | 142 ++++
> .../main/java/org/apache/juneau/BeanMap.java | 63 +-
> .../main/java/org/apache/juneau/BeanMeta.java | 14 +-
> .../org/apache/juneau/BeanPropertyMeta.java | 10 +-
> .../org/apache/juneau/BeanPropertyValue.java | 72 ++
> .../org/apache/juneau/html/HtmlSerializer.java | 33 +-
> .../apache/juneau/internal/DelegateBeanMap.java | 20 +
> .../org/apache/juneau/jena/RdfSerializer.java | 22 +-
> .../org/apache/juneau/json/JsonSerializer.java | 28 +-
> .../juneau/msgpack/MsgPackSerializer.java | 53 +-
> .../juneau/urlencoding/UonSerializer.java | 27 +-
> .../urlencoding/UrlEncodingSerializer.java | 27 +-
> .../org/apache/juneau/utils/MessageBundle.java | 2 +-
> .../org/apache/juneau/xml/XmlSerializer.java | 58 +-
> .../test/java/org/apache/juneau/CT_BeanMap.java | 13 +-
> 66 files changed, 1993 insertions(+), 1847 deletions(-)
> ----------------------------------------------------------------------
>
>
>