Fay.Liang 38f31456ac Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1 ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py Former-commit-id: a9a5aa6f70 [formerly 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6] Former-commit-id: 897194214e		2015-06-01 08:59:15 -04:00
..
META-INF	Omaha #3133 remove unnecessary register buddies	2014-06-23 14:13:19 -05:00
res/spring	Merge tag 'OB_14.4.1-20m' into omaha_15.1.1	2015-03-26 09:57:17 -05:00
resources	Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.	2015-03-19 16:13:56 -05:00
src/com/raytheon/edex/plugin/gfe	Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1	2015-06-01 08:59:15 -04:00
utility	Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1	2015-06-01 08:59:15 -04:00
.classpath	Issue #2208 moving edex unit tests to tests project	2013-07-25 12:29:46 -05:00
.project
.pydevproject	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
build.properties	Omaha #4518: ISC_Send_Area is always at least a union of ISC and FireWXAOR edit areas.	2015-05-21 15:01:03 -05:00
com.raytheon.edex.plugin.gfe.ecl
plugin-deploy.groovy	Issue #1924 - standardize build.properties files	2013-06-13 16:04:18 -05:00