Commit graph

27 commits

Author SHA1 Message Date
Bryan Kowal
38464427d3 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: feaacd9356
2013-10-31 15:34:46 -05:00
Steve Harris
82dec19b6a 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: bd95bb6a4e
2013-10-28 10:55:16 -04:00
Nate Jensen
960dc1e81e Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 27dd27a73f [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]
Former-commit-id: a1a9a4751a
2013-08-06 17:17:53 -05:00
Ron Anderson
d32f777957 Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: a915cdab25 [formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]
Former-commit-id: cfa2d38a32
2013-07-25 13:05:56 -05:00
Steve Harris
d8176d4a4c 13.5.1-3 baseline
Former-commit-id: 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]
Former-commit-id: 63803c1424
2013-06-24 09:29:43 -04:00
Steve Harris
6384018950 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
2013-06-10 15:17:17 -04:00
Steve Harris
aa9a719836 13.4.1-5 baseline
Former-commit-id: 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]
Former-commit-id: 85bbf6d242
2013-05-03 09:29:14 -05:00
Steve Harris
f95e0ad10b 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 2f517b7713
2013-04-24 17:15:55 -05:00
Steve Harris
792171756f 13.3.1-13 baseline
Former-commit-id: c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]
Former-commit-id: c77a452f5a
2013-03-26 12:43:07 -05:00
Steve Harris
be96282207 13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
2013-03-25 13:27:13 -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
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
Steve Harris
baa5de2147 13.1.1-10 baseline
Former-commit-id: 9b73b6a2a9 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]
Former-commit-id: 06d0e6dd16
2013-02-14 13:24:43 -06:00
Steve Harris
c2839cc86d 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Steve Harris
40a5bc1683 12.11.1-7 baseline
Former-commit-id: 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]
Former-commit-id: d8ca6b9005
2012-10-23 16:40:50 -05:00
Steve Harris
75901860c2 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]
Former-commit-id: c12ee14e66
2012-10-08 13:26:20 -05:00
Steven Harris
0e86bfd1d3 12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: 618aa3f316
2012-09-27 15:57:45 -05:00
Steve Harris
dde1f4c54d 12.10.1-2 baseline
Former-commit-id: a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]
Former-commit-id: 250f0ccac9
2012-09-11 15:50:57 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
2012-08-30 14:28:27 -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
36c108e960 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: dcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
8309193ce9 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 31ae7ea218
2012-08-15 13:59:00 -05:00
Steve Harris
11f96dbedd 12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
2012-07-19 16:20:40 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -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
Steve Harris
0e4128712b 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
2012-03-30 08:38:33 -05: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