[jira] [Commented] (GEODE-8) Merge Remaining GemFire Code to Geode

["ASF subversion and git services (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/GEODE-8?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14615428#comment-14615428 ] 

ASF subversion and git services commented on GEODE-8:
-----------------------------------------------------

Commit 221cce709af662c6633f72835cbb21ce967740c8 in incubator-geode's branch refs/heads/feature/GEODE-8 from [~dschneider]
[ https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;h=221cce7 ]

Merge branch 'develop' into feature/GEODE-8.
Resolved conflicts and did a build. Unit test have not yet been run.

Conflicts:
	RUNNING.txt
	build.gradle
	gemfire-assembly/build.gradle
	gemfire-core/build.gradle
	gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
	gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/RestAgent.java
	gradle.properties


> Merge Remaining GemFire Code to Geode
> -------------------------------------
>
>                 Key: GEODE-8
>                 URL: https://issues.apache.org/jira/browse/GEODE-8
>             Project: Geode
>          Issue Type: New Feature
>          Components: general
>            Reporter: Dan Smith
>            Assignee: Roman Shaposhnik
>              Labels: asf-migration
>
> The initial geode source code came from a feature branch of the GemFire codebase. There are several feature branches, not to mention the mainline develop branch, that were already in progress when that drop was made.
> This is an umbrella issue to track the status of all of this remaining code that still needs to be migrated to geode.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)