Steve Harris
|
85d3d96d4c
|
Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
3c8ac339bb
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]]
Former-commit-id: ecb38ba165
Former-commit-id: 9397ca10a8 [formerly d83100c3df] [formerly 7430208f5d1e69b088b0ad09205b10f1007182e4 [formerly a9b900821a]]
Former-commit-id: 45ca1834b3349431a2e9329f63d92b5396d451f6 [formerly 32fa2a28c5]
Former-commit-id: 3433a1e31c
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
90432da18a
|
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]]
Former-commit-id: 496cc6a06b
Former-commit-id: 3371e158a6 [formerly dd3a5a8d88] [formerly 8f3e38d67a9e00af420a14793a365b7fbe9bd292 [formerly 4a93298877]]
Former-commit-id: 745a23d67040229fe246ffa1c83646920a36c89f [formerly 37e57b6588]
Former-commit-id: 7ca623525e
|
2012-02-20 16:38:06 -06:00 |
|
David Gillingham
|
4349cccf11
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]]]
Former-commit-id: 061966f243
Former-commit-id: 9a17298fb6 [formerly 3e42bc7d2d] [formerly 4931a468f096c3bd0bb7f0820c5d10d1c1c224aa [formerly 9f416558fa]]
Former-commit-id: 0be14ae8d9ccc5883f09318f7a66b2bf2cf6b629 [formerly 5a44726c19]
Former-commit-id: 8efd012653
|
2012-02-13 16:09:36 -06:00 |
|
Matt Nash
|
116c79c2f1
|
Issue #192 gitignore changes
Former-commit-id: ce6f4e409f [formerly 7d36323ae9] [formerly 5fdadf4333] [formerly ce6f4e409f [formerly 7d36323ae9] [formerly 5fdadf4333] [formerly 426da850d3 [formerly 5fdadf4333 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]]]]
Former-commit-id: 426da850d3
Former-commit-id: a4cee49270 [formerly 203ec03a08] [formerly 6a7793fa54d4408e6d78ca96a150c3d2c752697d [formerly 380179f10d]]
Former-commit-id: 23e3a8a543907ead6c51e6bc9ab5122c1fd66c7e [formerly 1cde55048e]
Former-commit-id: 0777f62d50
|
2012-02-03 15:03:21 -06:00 |
|
David Gillingham
|
531c37f6fb
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]]
Former-commit-id: b056e18757
Former-commit-id: f2b58b2f16 [formerly ea7a55ad8d] [formerly 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]]
Former-commit-id: 2dfb07d58a5928ce4fb055932bcc4ae63a274440 [formerly d85d78f180]
Former-commit-id: e8d336e205
|
2012-01-26 17:38:43 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|