Commit graph

17 commits

Author SHA1 Message Date
Nate Jensen
65b9bafed7 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]
Former-commit-id: d74936ef3e
2013-05-23 10:06:28 -05:00
Ben Steffensmeier
89b4bd571a Issue #1869 Remove DataURI column from qc.
Former-commit-id: f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]
Former-commit-id: c0d8dad8ae
2013-05-16 17:48:37 -05:00
Steve Harris
9879b94de9 Merge branch 'omaha_13.3.1' into development
Former-commit-id: 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]
Former-commit-id: 8b607f8228
2013-04-04 11:58:50 -05:00
Steve Harris
f3e79bcc9d 13.3.1-18 baseline
Former-commit-id: ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]
Former-commit-id: a2b098d86d
2013-04-03 14:58:29 -05:00
Bryan Kowal
820518ffb9 Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: 3baebb684b [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]
Former-commit-id: 0479eb0cc1
2013-03-20 16:53:18 -05:00
Steve Harris
0055a3213d Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]
Former-commit-id: e2496455b2
2013-03-20 16:09:26 -05:00
Steve Harris
57f4676b6c 13.3.1-10 baseline
Former-commit-id: 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]
Former-commit-id: 073687d9a9
2013-03-20 15:53:01 -05:00
Max Schenkelberg
43341e7ad3 Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]
Former-commit-id: c6db3ce43b
2013-03-20 14:10:52 -05:00
Steve Harris
28ef804e1b Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]
Former-commit-id: b8f0635ad6
2013-03-18 16:52:00 -05:00
Steve Harris
bc9df0a8f9 13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: f97d78994b
2013-03-18 15:43:32 -05:00
Dustin Johnson
fff7e7983f Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]
Former-commit-id: ecb0d2c826
2013-03-15 11:51:58 -05:00
Steve Harris
2e110bd151 13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
2013-03-12 08:35:45 -05:00
Steve Harris
48d1aa7732 13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
2013-01-23 11:13:03 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00