Steve Harris a4eb467a34 Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge ... Conflicts: edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]] Former-commit-id: fee53dea94 Former-commit-id: 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648] Former-commit-id: 51bb9ebb46		2012-04-10 12:50:03 -05:00
..
bin	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.	2012-04-09 09:32:45 -05:00
conf	Merge branch 'ss_sync' into 9-Wes2Bridge	2012-02-27 15:58:49 -06:00
data	Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge	2012-04-10 12:50:03 -05:00
etc	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
lib	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
webapps/admin	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00