Richard Peter
|
d88ae4c2ca
|
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 734b5524b8 [formerly 979fa16d04] [formerly 157e739623] [formerly 157e739623 [formerly 14b1e924a1]] [formerly 734b5524b8 [formerly 979fa16d04] [formerly 157e739623] [formerly 157e739623 [formerly 14b1e924a1]] [formerly 0bb5e2a61e [formerly 157e739623 [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: b7cec356de [formerly 586b11c80d] [formerly 65e8ad1a62] [formerly 26c520aee77b3dcc627f70fd30dc94e86ccd7862 [formerly 29857e1e475c9363f0f62efb31ac6cf02ee6e84f] [formerly 65e8ad1a62 [formerly 1a7dd7723b]]]
Former-commit-id: d701ff3d49d321df293dee24fa59fae070019e40 [formerly 267888101d1e70c5ebb253bbe68dc00463f279b2] [formerly 8247da7774 [formerly 38d2c6564a]]
Former-commit-id: 8247da7774
Former-commit-id: 448c6c570e
|
2013-11-14 17:21:48 -06:00 |
|
Brian Clements
|
b43a202e33
|
Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: 9046416a69 [formerly e8c8314abe] [formerly 55682480e1] [formerly 55682480e1 [formerly cacdf313c5]] [formerly 9046416a69 [formerly e8c8314abe] [formerly 55682480e1] [formerly 55682480e1 [formerly cacdf313c5]] [formerly 00490c2db2 [formerly 55682480e1 [formerly cacdf313c5] [formerly 00490c2db2 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]]]
Former-commit-id: 00490c2db2
Former-commit-id: f1a86cb0e8 [formerly 7625e0ef16] [formerly 878a677d18] [formerly cc501bb728dea3e1ab5e0e5f5a6c59e328e5e7b9 [formerly 8742dd3b5b719d9daf15294c04f9699017a3a49b] [formerly 878a677d18 [formerly ab24330f23]]]
Former-commit-id: e9a8d12ea8be6d1a6e7c0efcf7e5d6195acc63d2 [formerly 8e8a6bfd8a34aa6c97d6d0ea6b0fad6ad98a7ebf] [formerly 1a2b934e97 [formerly e7c355df52]]
Former-commit-id: 1a2b934e97
Former-commit-id: 241564343a
|
2013-11-14 17:12:02 -06:00 |
|
Mike Duff
|
95361f8085
|
Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: cb2965e166 [formerly 223901d9cf] [formerly 8cc9c1de59] [formerly 8cc9c1de59 [formerly 47011a70db]] [formerly cb2965e166 [formerly 223901d9cf] [formerly 8cc9c1de59] [formerly 8cc9c1de59 [formerly 47011a70db]] [formerly 47a0477587 [formerly 8cc9c1de59 [formerly 47011a70db] [formerly 47a0477587 [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]]]
Former-commit-id: 47a0477587
Former-commit-id: cafc98c48c [formerly 0f848918e8] [formerly 44cc3d8776] [formerly aa9510c21c7edf0468a792a3e9a4f4ccd8099aa3 [formerly 33980f8e6df3009e6c047cfc2074778085a37612] [formerly 44cc3d8776 [formerly b929b7aa02]]]
Former-commit-id: 299b24cb0370d1f55c58b0888dc36ebeb1d6dd0a [formerly 0ff9a554b33df76684f00b9934e1c4b55b0cb9f6] [formerly 769e81cd23 [formerly 5fdf101af6]]
Former-commit-id: 769e81cd23
Former-commit-id: 0e3d39d133
|
2013-11-14 17:07:54 -06:00 |
|
Nate Jensen
|
4e76cc8f41
|
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: b097b27e53 [formerly 2d5752d3d6] [formerly 3b11ea8c5b] [formerly 3b11ea8c5b [formerly b4bcd14a85]] [formerly b097b27e53 [formerly 2d5752d3d6] [formerly 3b11ea8c5b] [formerly 3b11ea8c5b [formerly b4bcd14a85]] [formerly c2aacfc437 [formerly 3b11ea8c5b [formerly b4bcd14a85] [formerly c2aacfc437 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]]]
Former-commit-id: c2aacfc437
Former-commit-id: f258e6237b [formerly 31392685aa] [formerly f0a0287230] [formerly 9fdb35653724e58c010080f229d35fd2d54e6179 [formerly dcba58ed57cf3e8859d8471e47fda78c0e7ef984] [formerly f0a0287230 [formerly a8a1e396fe]]]
Former-commit-id: d0cd0b2237157195474f1f9fb522054b1bd0ef81 [formerly 92e37cdfb10a78fc44861b3461fac1e50f9a0b14] [formerly f6abd529f7 [formerly 7ec18ba0b1]]
Former-commit-id: f6abd529f7
Former-commit-id: da110c93cc
|
2013-11-14 16:34:28 -06:00 |
|
Bryan Kowal
|
02ab842834
|
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: 11154ed8bd [formerly 8b274264c9] [formerly 782675951b] [formerly 782675951b [formerly be78fab116]] [formerly 11154ed8bd [formerly 8b274264c9] [formerly 782675951b] [formerly 782675951b [formerly be78fab116]] [formerly ce16efc9a1 [formerly 782675951b [formerly be78fab116] [formerly ce16efc9a1 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 8d2303551d [formerly e810496889] [formerly 512fc1a7c1] [formerly 6781b56d6c0a82f5f91f50cd6cbd6000c5e14b39 [formerly 5e386da33f46128ec2187010bd711c2f5ecf11d8] [formerly 512fc1a7c1 [formerly a6ea71d46f]]]
Former-commit-id: 7d717bac2b3b4415d052ce4f581c58ef35cebcb8 [formerly a19458086623da11654c40c655f01519bd804871] [formerly bc25cbe7ad [formerly 4275b195ce]]
Former-commit-id: bcc8ffd9dd9301636a847f8917aa531fde21a318 [formerly bc25cbe7ad]
Former-commit-id: 14b78c5952
|
2013-11-14 15:17:28 -06:00 |
|
Richard Peter
|
89459f0994
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: d33f83272f [formerly 9bebb21be8] [formerly 800effdc5a] [formerly 800effdc5a [formerly 8fb79e7b73]] [formerly d33f83272f [formerly 9bebb21be8] [formerly 800effdc5a] [formerly 800effdc5a [formerly 8fb79e7b73]] [formerly c42f931118 [formerly 800effdc5a [formerly 8fb79e7b73] [formerly c42f931118 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]]]
Former-commit-id: c42f931118
Former-commit-id: 6b051d88f5 [formerly b9da33bcea] [formerly e5dc8e2027] [formerly 8c896cdcda3edc1834470a523634aa1bfb977c97 [formerly d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f] [formerly e5dc8e2027 [formerly 2b95bcfb31]]]
Former-commit-id: 391807d2950099eae2ea3edc6970d4e857bf3336 [formerly 6bd09bf526063f854e453bf474886432548c3c50] [formerly 2025e073ef [formerly e7d8e5e560]]
Former-commit-id: 2025e073ef
Former-commit-id: 170aeb49af
|
2013-11-14 14:56:59 -06:00 |
|
Lee Venable
|
99a0e6d704
|
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: 68166946ac [formerly 2f134e6aa3] [formerly bd81ec8807] [formerly bd81ec8807 [formerly 834c2ac8da]] [formerly 68166946ac [formerly 2f134e6aa3] [formerly bd81ec8807] [formerly bd81ec8807 [formerly 834c2ac8da]] [formerly f0ebee3bb3 [formerly bd81ec8807 [formerly 834c2ac8da] [formerly f0ebee3bb3 [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 2fb4806f0e [formerly 0e326c2a12] [formerly e9b8ee42c7] [formerly 517a2348149e9a63a4dc4a3aa77d97569e5c1eb5 [formerly a74585351b2263565cb70d9d704cba8fb765886e] [formerly e9b8ee42c7 [formerly 7d04b2e4ce]]]
Former-commit-id: 6040035d00a4c9cf574cb973dbf2ebd698a47f0e [formerly 649ceeb15e5073f34a435cdd6eb59756c9c5ec8a] [formerly 194a6760b7 [formerly ad77be1b44]]
Former-commit-id: 194a6760b7
Former-commit-id: 71f7f7f52f
|
2013-11-14 14:43:18 -06:00 |
|
Mike Duff
|
c38f30e36b
|
Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: 8cf83711a9 [formerly c3aee76403] [formerly f6c4ca2bc0] [formerly f6c4ca2bc0 [formerly 87a4b1bec4]] [formerly 8cf83711a9 [formerly c3aee76403] [formerly f6c4ca2bc0] [formerly f6c4ca2bc0 [formerly 87a4b1bec4]] [formerly a80964bc7c [formerly f6c4ca2bc0 [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]]]
Former-commit-id: a80964bc7c
Former-commit-id: e9d6371686 [formerly b27ee6803f] [formerly 48093514a6] [formerly ec2285741e0f4ff7ad982f91b93a9b36dc6c6a83 [formerly 0ded51344d49c52b18e3738df599260571f7155a] [formerly 48093514a6 [formerly 4557a06f42]]]
Former-commit-id: 4247c9b14050a2492c1915785e835419b60a2c80 [formerly 1f88021dcffff2375d1ca1a6dd6252ce277c8f2c] [formerly 2b91b4b9ef [formerly cf077ed7f9]]
Former-commit-id: a79fb6b1a9023af1d2cb938473139ee0e627500a [formerly 2b91b4b9ef]
Former-commit-id: b4eaa45753
|
2013-11-14 14:40:33 -06:00 |
|
Richard Peter
|
c84a8f297b
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 7827335af6 [formerly 6502f1f695] [formerly 2c753c427c] [formerly 2c753c427c [formerly 79bdd34f4f]] [formerly 7827335af6 [formerly 6502f1f695] [formerly 2c753c427c] [formerly 2c753c427c [formerly 79bdd34f4f]] [formerly 0074b774f0 [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]]
Former-commit-id: 0074b774f0
Former-commit-id: c68faceb0c [formerly 625647a717] [formerly b4aac09ff4] [formerly c6b0f50bf98bad8774714a0a2af24c321c675953 [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7] [formerly b4aac09ff4 [formerly 96b4944b41]]]
Former-commit-id: 23f1516a8d596f72d8ef1601a64d3c6dc7a13242 [formerly 2067b058e879c394c330dccfc1994698c7f7cb05] [formerly 705339a320 [formerly e2a16fd876]]
Former-commit-id: 705339a320
Former-commit-id: d289419c40
|
2013-11-14 14:40:23 -06:00 |
|
Lee Venable
|
c3644745f8
|
Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: 70268c4092 [formerly d42589d14f] [formerly 6086c06f66] [formerly 6086c06f66 [formerly d431f3c0f4]] [formerly 70268c4092 [formerly d42589d14f] [formerly 6086c06f66] [formerly 6086c06f66 [formerly d431f3c0f4]] [formerly bc7f5e556d [formerly 6086c06f66 [formerly d431f3c0f4] [formerly bc7f5e556d [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 626352ab94 [formerly b93b05165c] [formerly 69934b9b32] [formerly 708e1f3741926db38d15198c058d16d4a87feb43 [formerly 8b1c54f60a8cccda08a50dac70415ec886062e9b] [formerly 69934b9b32 [formerly 17fef206fc]]]
Former-commit-id: d285dc46e8783aaa412383bd2a489178cd05d20b [formerly b05b8692e13600b879c8d4c9de8f0c9322ffe832] [formerly ab512eaeb1 [formerly 84de0beae4]]
Former-commit-id: ab512eaeb1
Former-commit-id: 686d984163
|
2013-11-14 14:33:18 -06:00 |
|
Richard Peter
|
26c08df143
|
Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: eec0f3f36c [formerly 7c5e85a288] [formerly 5c5e71a01b] [formerly 5c5e71a01b [formerly 4d18c7d493]] [formerly eec0f3f36c [formerly 7c5e85a288] [formerly 5c5e71a01b] [formerly 5c5e71a01b [formerly 4d18c7d493]] [formerly 3f5c590c5f [formerly 5c5e71a01b [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 5bec9868bd [formerly df3e6735af] [formerly 6af248f212] [formerly e2f4ff15ae453ee3a6beb786427b2d6a5161ca5b [formerly 493a9f0f3191b9c74a85050ff2e11f14b925c249] [formerly 6af248f212 [formerly 3dc0ad184c]]]
Former-commit-id: 482c45931bc4cca79394e6ff6cb5803500f9a6a8 [formerly 90ff75232070f6fc3d10b664951a96a9876cc88b] [formerly 7375a3b961 [formerly ace2a71092]]
Former-commit-id: 7375a3b961
Former-commit-id: 24e58ea252
|
2013-11-14 13:30:09 -06:00 |
|
Nate Jensen
|
1d6b87882a
|
Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 4e3a4fe9f2 [formerly 9517c96d68] [formerly a4eb19fc79] [formerly a4eb19fc79 [formerly 9acda0b9f2]] [formerly 4e3a4fe9f2 [formerly 9517c96d68] [formerly a4eb19fc79] [formerly a4eb19fc79 [formerly 9acda0b9f2]] [formerly c5cf68cc45 [formerly a4eb19fc79 [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]]]
Former-commit-id: c5cf68cc45
Former-commit-id: 76d7b28044 [formerly ddcca3463d] [formerly e41f57da67] [formerly 17d63faeaf5dadfe484c1d0ec3d6c9019592ce36 [formerly a2b53d6aca5047e5514931e92e017ed5771c890d] [formerly e41f57da67 [formerly a6be904c69]]]
Former-commit-id: 26ea417f79bd7c0f1277a93b2a2df49ae0c0db47 [formerly 6f2e3001c41627a8a93fc22d02074369aa136e2d] [formerly 6441290b40 [formerly e83a828209]]
Former-commit-id: 6441290b40
Former-commit-id: 493fa54860
|
2013-11-14 13:29:30 -06:00 |
|
Bryan Kowal
|
bb5eabf820
|
Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching
Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1
Former-commit-id: ddb4bf1ac0 [formerly 7b9c8a6174] [formerly 48cc679bce] [formerly 48cc679bce [formerly 2029c34f24]] [formerly ddb4bf1ac0 [formerly 7b9c8a6174] [formerly 48cc679bce] [formerly 48cc679bce [formerly 2029c34f24]] [formerly 7e35ea310f [formerly 48cc679bce [formerly 2029c34f24] [formerly 7e35ea310f [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]]]
Former-commit-id: 7e35ea310f
Former-commit-id: c8dfe55d7b [formerly 8a0b0667de] [formerly 4759e48c5c] [formerly ff62496e52eff47e878914a685621df1a96d5228 [formerly 90670353179a78bde76d7ccb60b47f097fef7acd] [formerly 4759e48c5c [formerly a2261b9ff3]]]
Former-commit-id: a04623464b4e8f7211501dcc2bde5f74c90ff86d [formerly 5339245b650c517d8012d02401b6076bf3cd1ed8] [formerly ae5e6b3927 [formerly 79045d620b]]
Former-commit-id: ae5e6b3927
Former-commit-id: fde6569c34
|
2013-11-14 11:57:11 -06:00 |
|
Steve Harris
|
0a6a65a93d
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: c4467e5121 [formerly 361df767a8] [formerly 77ea1782c3] [formerly 77ea1782c3 [formerly 473488f5b8]] [formerly c4467e5121 [formerly 361df767a8] [formerly 77ea1782c3] [formerly 77ea1782c3 [formerly 473488f5b8]] [formerly 4d25eb11c8 [formerly 77ea1782c3 [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: cea2321c16 [formerly d6ef4ae259] [formerly a75acc5499] [formerly 1d8dcaa2f6eca2d264ef913be1385d78b44ae159 [formerly 282970560ec2ee6eee13b9272e753fbb7d551416] [formerly a75acc5499 [formerly ef852ac125]]]
Former-commit-id: f2975cbb4bbe3eee9f66131c148397499982d660 [formerly 495f8b46971170beee79e3e200e5aea8c63cfc3b] [formerly 8307fe3a9f [formerly 39e8f5ecc1]]
Former-commit-id: b747973058226342d9e33c6f6e781ec3883a297e [formerly 8307fe3a9f]
Former-commit-id: c214af60f6
|
2013-11-13 23:20:18 -06:00 |
|
Richard Peter
|
981d756a27
|
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: e77b22d39b [formerly 9e4949eeb9] [formerly adc30e817e] [formerly adc30e817e [formerly 2f3eee1439]] [formerly e77b22d39b [formerly 9e4949eeb9] [formerly adc30e817e] [formerly adc30e817e [formerly 2f3eee1439]] [formerly e88f5777a7 [formerly adc30e817e [formerly 2f3eee1439] [formerly e88f5777a7 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]]]
Former-commit-id: e88f5777a7
Former-commit-id: 81afc3b328 [formerly 42ac155685] [formerly ed258e9421] [formerly 956569dbead7dfdc7c0d357b837bfa1e36eff1eb [formerly 5c494cb47ccf4d7292296be310025fbd46ce817f] [formerly ed258e9421 [formerly 64afe42e74]]]
Former-commit-id: 3d663f600743c650f04f1568327d3c00a83310f2 [formerly ce9e0daca12be42a0eea37a51d5530a1d4b7f8d1] [formerly 0581cc53e5 [formerly 58c8106da8]]
Former-commit-id: 0581cc53e5
Former-commit-id: 0e6f70cb31
|
2013-11-13 16:43:26 -06:00 |
|
Greg Armendariz
|
44619d6933
|
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: d623df334c [formerly a0b16bafee] [formerly 06e3f849f0] [formerly 06e3f849f0 [formerly 83ac36721b]] [formerly d623df334c [formerly a0b16bafee] [formerly 06e3f849f0] [formerly 06e3f849f0 [formerly 83ac36721b]] [formerly 3f6281fdbe [formerly 06e3f849f0 [formerly 83ac36721b] [formerly 3f6281fdbe [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: 269132f827 [formerly 2d92a5719c] [formerly b7c3a7e850] [formerly 579c0fa6f5dcf24a01c9892d008166940c735f87 [formerly a557332626ac393163cd374e7ee121dc81df86a4] [formerly b7c3a7e850 [formerly ce0a05242f]]]
Former-commit-id: fc4ef9d9f5fa4bd532f2ec3e2f44d19738e39920 [formerly 571affa63254c2077485a938f0d063bd2b14e213] [formerly 8809254168 [formerly 977e0fab0e]]
Former-commit-id: 0b569cea045f1910a7f5540a7c67bf6400b1ef6e [formerly 8809254168]
Former-commit-id: 13f777cc62
|
2013-11-13 15:30:55 -06:00 |
|
Brian Clements
|
59637dcd61
|
Issue #2505 removed recco from deployment
added update script to drop recco from db
Former-commit-id: e88bbe2aff [formerly 3204a2f7b5] [formerly 3551b731e0] [formerly 3551b731e0 [formerly 95f1621d3e]] [formerly e88bbe2aff [formerly 3204a2f7b5] [formerly 3551b731e0] [formerly 3551b731e0 [formerly 95f1621d3e]] [formerly 8cbe2c06a8 [formerly 3551b731e0 [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 27ebb8e6bb [formerly b5b94646cf] [formerly d2f0b73626] [formerly e25afb71a09ec42d78796d89ab5d9f1b601d1805 [formerly 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81] [formerly d2f0b73626 [formerly 49c8bd5ee9]]]
Former-commit-id: 7426be3e79f4d28179f5977aace075f5e8538851 [formerly 7384c5efc3b7d3bed603cfe7ab8ff291ceab0e23] [formerly 09101ca5ac [formerly d94f44d406]]
Former-commit-id: 09101ca5ac
Former-commit-id: bdf611db27
|
2013-11-13 13:45:44 -06:00 |
|
Bryan Kowal
|
0ed5d2ebb0
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 8a30e2c46a [formerly 1d519f9778] [formerly 178d95e59d] [formerly 178d95e59d [formerly 86dd200844]] [formerly 8a30e2c46a [formerly 1d519f9778] [formerly 178d95e59d] [formerly 178d95e59d [formerly 86dd200844]] [formerly 0544b66f4e [formerly 178d95e59d [formerly 86dd200844] [formerly 0544b66f4e [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: 62e8aa6db7 [formerly ce40d40304] [formerly a2b1211c52] [formerly ea5dfc2ea72cf9e9da7eee4e6db6b4533e11c6d4 [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974] [formerly a2b1211c52 [formerly 01735ca0c4]]]
Former-commit-id: adca024c05293f40bb85dd887b5d239285d18e74 [formerly 52598106710ffd4583947f5428f98b7eb89170c3] [formerly 97c0dff26a [formerly 1a905e8a3c]]
Former-commit-id: 97c0dff26a
Former-commit-id: 89b9e26156
|
2013-11-13 13:16:55 -06:00 |
|
Steve Harris
|
55aef73ccf
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 444c650613 [formerly 3e8014e9f8] [formerly eb470599f3] [formerly eb470599f3 [formerly 0a37219d2a]] [formerly 444c650613 [formerly 3e8014e9f8] [formerly eb470599f3] [formerly eb470599f3 [formerly 0a37219d2a]] [formerly 2e7a594d51 [formerly eb470599f3 [formerly 0a37219d2a] [formerly 2e7a594d51 [formerly ebde6dc849a1ca9753f959423109186c836b4525]]]]]
Former-commit-id: 2e7a594d51
Former-commit-id: a5c9a2aefd [formerly 6af0dcf567] [formerly 80c709b3f4] [formerly 55cb0134fba0416759233099f2b05539cbae5654 [formerly 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb] [formerly 80c709b3f4 [formerly bc45f3668b]]]
Former-commit-id: 302f045a1ff9b8cab0035ecff401539f0bd2182d [formerly 0e519fa7a1edf2e5477d6d7126baa658bb25f2d1] [formerly 661dbe2860 [formerly 1fdc64c7e7]]
Former-commit-id: 661dbe2860
Former-commit-id: 91027b38db
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
deb7f8007c
|
14.1.1-8 baseline
Former-commit-id: 087aef994f [formerly 8606fed724] [formerly 90bc008a50] [formerly 90bc008a50 [formerly aa6c977e7b]] [formerly 087aef994f [formerly 8606fed724] [formerly 90bc008a50] [formerly 90bc008a50 [formerly aa6c977e7b]] [formerly c7d36eb6ad [formerly 90bc008a50 [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: b5a4997cb5 [formerly 1902ca9cfb] [formerly b7ca6163e3] [formerly 03df84ac5f9dd38b080ba0831ba156f377fa54bb [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7] [formerly b7ca6163e3 [formerly 0123596fd9]]]
Former-commit-id: 3d51417a06af433a423ecdcf2f45120d141d0a37 [formerly 299bb48cc93fac70de777c99a73fd516cc085238] [formerly d2104614be [formerly 42ece4fb6a]]
Former-commit-id: d2104614be
Former-commit-id: 7facd4fe25
|
2013-11-13 12:32:17 -05:00 |
|
Benjamin Phillippe
|
4309790034
|
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: ff3218932b [formerly 7b53fc40d4] [formerly c294d5d77a] [formerly c294d5d77a [formerly 5cd030f096]] [formerly ff3218932b [formerly 7b53fc40d4] [formerly c294d5d77a] [formerly c294d5d77a [formerly 5cd030f096]] [formerly 1c46226a11 [formerly c294d5d77a [formerly 5cd030f096] [formerly 1c46226a11 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]]]
Former-commit-id: 1c46226a11
Former-commit-id: 5a330539dc [formerly 7cbc9b4ef3] [formerly 1a19965daf] [formerly fbf1bc69d5ed89337832d9bcca75acb9fa5319c1 [formerly 02517e3b01d1874cc92736a35804499b6a45c0d6] [formerly 1a19965daf [formerly fe7c6886c4]]]
Former-commit-id: 8c026774c9ca3e03ff74d3878c92ea4580e4f50c [formerly b488e8fc371f0360383d01dae50168e03ac18f75] [formerly 7ae33612c5 [formerly 64a37e7672]]
Former-commit-id: 7ae33612c5
Former-commit-id: 516cb4648c
|
2013-11-13 10:52:07 -06:00 |
|
Brian Clements
|
19a38538fc
|
Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 931c1f30b3 [formerly 0991849617] [formerly 0d80fa7dc1] [formerly 0d80fa7dc1 [formerly dfd88151e6]] [formerly 931c1f30b3 [formerly 0991849617] [formerly 0d80fa7dc1] [formerly 0d80fa7dc1 [formerly dfd88151e6]] [formerly 37f4f41d2d [formerly 0d80fa7dc1 [formerly dfd88151e6] [formerly 37f4f41d2d [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: 3409b09b04 [formerly c399d0394f] [formerly c3a0ea3400] [formerly 24e5f2b3ce140c27ab68ded52ce63f4d6097f031 [formerly e50da8d67f3cc8f84bc4978a0aab417ea16a7c26] [formerly c3a0ea3400 [formerly ef2acc6562]]]
Former-commit-id: 3227a37827d2640ce47cb0ee0a470160f5df523b [formerly 43f5f85d2db77290d610b2bb501ffa92d7faa7cd] [formerly eb9764b77b [formerly ac221125f4]]
Former-commit-id: eb9764b77b
Former-commit-id: 9d8010e1d8
|
2013-11-13 10:04:13 -06:00 |
|
Nate Jensen
|
9b9644a728
|
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 0953bc9911 [formerly 47f8811992] [formerly 51ba5f770c] [formerly 51ba5f770c [formerly 85923b0f7f]] [formerly 0953bc9911 [formerly 47f8811992] [formerly 51ba5f770c] [formerly 51ba5f770c [formerly 85923b0f7f]] [formerly c0ed705daf [formerly 51ba5f770c [formerly 85923b0f7f] [formerly c0ed705daf [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]]]
Former-commit-id: c0ed705daf
Former-commit-id: 8864c7409e [formerly df8ddb3eac] [formerly fad5c6d615] [formerly f3e21d4f1632d339b9ae206c5f3bc38f96f8a708 [formerly 8aeadacd76d9077469357c8afa7195a688cca933] [formerly fad5c6d615 [formerly a62e415724]]]
Former-commit-id: b4dd1db4f5a8aafa45fbf9f0a00a8e82b4332879 [formerly 004d25305a2a74a752f4ba7a92f1b8bbb916144c] [formerly 1c92fc757b [formerly b7085b0ed4]]
Former-commit-id: 1c92fc757b
Former-commit-id: d507cbd5dd
|
2013-11-13 09:01:09 -06:00 |
|
Brian Clements
|
26e1afc1fd
|
Issue #2546 added fix for TAFs that contain legacy valid times
added unit test
Former-commit-id: 3f8df93c16 [formerly 04a9d3ae08] [formerly b0a5192dfa] [formerly b0a5192dfa [formerly 191ffc6e63]] [formerly 3f8df93c16 [formerly 04a9d3ae08] [formerly b0a5192dfa] [formerly b0a5192dfa [formerly 191ffc6e63]] [formerly df1542a66c [formerly b0a5192dfa [formerly 191ffc6e63] [formerly df1542a66c [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]]]
Former-commit-id: df1542a66c
Former-commit-id: e98bacf3b7 [formerly 381a274111] [formerly bca5149811] [formerly 3a15a784d9871b58956eca1d3e90259d303e42da [formerly 3ac020de4f913cf98382a5249c8fda9e76a0edaa] [formerly bca5149811 [formerly 0e5d3e9e69]]]
Former-commit-id: 725c679d7b2c92b66cf39b5c89051014aa157f02 [formerly 31f963a907811d6d1817831b842056f2d9e806f2] [formerly 1d41861c3c [formerly b511453153]]
Former-commit-id: 1d41861c3c
Former-commit-id: 2c76698c78
|
2013-11-13 08:07:29 -06:00 |
|
Bryan Kowal
|
69885be19c
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: eb14a4c701 [formerly 8afbe25d22] [formerly b2272ad695] [formerly b2272ad695 [formerly a51231058a]] [formerly eb14a4c701 [formerly 8afbe25d22] [formerly b2272ad695] [formerly b2272ad695 [formerly a51231058a]] [formerly e3639da703 [formerly b2272ad695 [formerly a51231058a] [formerly e3639da703 [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]]]
Former-commit-id: e3639da703
Former-commit-id: 1d5b5cf517 [formerly ad1e4c66b8] [formerly b2c63727ba] [formerly 797834de775350b6bef2f421b024617971b66585 [formerly 9b2674319137dc98ffe2e221d63d5f3dae8f1e22] [formerly b2c63727ba [formerly 48d5d8c3a1]]]
Former-commit-id: be153ad78b7689a13b6d5fc0eec165e95a367661 [formerly 05930d677355374fbcc6438692928f1740b35460] [formerly cfb3717a61 [formerly a575f41589]]
Former-commit-id: cfb3717a61
Former-commit-id: 1134d55c7b
|
2013-11-12 19:57:25 -06:00 |
|
Bryan Kowal
|
33ce834284
|
Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: bc25e93a7d [formerly 46264b5fcc] [formerly 631c03601c] [formerly 631c03601c [formerly 7cac007ef1]] [formerly bc25e93a7d [formerly 46264b5fcc] [formerly 631c03601c] [formerly 631c03601c [formerly 7cac007ef1]] [formerly d76033ff3d [formerly 631c03601c [formerly 7cac007ef1] [formerly d76033ff3d [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]]]
Former-commit-id: d76033ff3d
Former-commit-id: 9b8fa911c3 [formerly d8a1e15951] [formerly e9ff5e018b] [formerly feb2aa0b0dda7ccd1063558cea4d558d5bad9640 [formerly 08a3d0dc0c028b514f152d7d2df94af1610acc50] [formerly e9ff5e018b [formerly 084d772588]]]
Former-commit-id: 597b2e152fd29eb82d76be1e75ec26565ac4609d [formerly 5a7b66c6f75c115cad84c4d0aaf076e8a21ad3a3] [formerly d83504922b [formerly 8867114ff8]]
Former-commit-id: d83504922b
Former-commit-id: 6b9cae71e2
|
2013-11-12 17:43:10 -06:00 |
|
Nate Jensen
|
2e0975cdf8
|
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: f332e6fa19 [formerly b59a0230e5] [formerly f2f778c042] [formerly f2f778c042 [formerly accfefae6d]] [formerly f332e6fa19 [formerly b59a0230e5] [formerly f2f778c042] [formerly f2f778c042 [formerly accfefae6d]] [formerly f0b386b632 [formerly f2f778c042 [formerly accfefae6d] [formerly f0b386b632 [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]]]
Former-commit-id: f0b386b632
Former-commit-id: a9bb40e940 [formerly 793a7f6544] [formerly ec073efd45] [formerly ba368fcf6eceee6fda2bd6ae18eff7963a4aec5e [formerly dfb26a2628a5b054a3463a05d41c518dd8e86068] [formerly ec073efd45 [formerly 80227c4750]]]
Former-commit-id: edd792646f0188f90778088426898c52b13fc876 [formerly 73824090615da78d44f25ffa6e0796a9268ffcc8] [formerly 6b4284ec55 [formerly 633faf692b]]
Former-commit-id: 6b4284ec55
Former-commit-id: ad4f555802
|
2013-11-12 16:55:31 -06:00 |
|
Nate Jensen
|
38c3225c1c
|
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: e5663cc46a [formerly decad66d76] [formerly 8df2c48648] [formerly 8df2c48648 [formerly 8cf1b752e0]] [formerly e5663cc46a [formerly decad66d76] [formerly 8df2c48648] [formerly 8df2c48648 [formerly 8cf1b752e0]] [formerly b1d376e238 [formerly 8df2c48648 [formerly 8cf1b752e0] [formerly b1d376e238 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]]]
Former-commit-id: b1d376e238
Former-commit-id: 847298c438 [formerly ad6d935205] [formerly b0cfb6e836] [formerly 9121e0145a098b1296978c4e9d0bfabc78d8df54 [formerly 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f] [formerly b0cfb6e836 [formerly 645e816d5d]]]
Former-commit-id: c3c819003776099e99b6574e50de9adf66731d05 [formerly 8056424dfb851f8b8deb8e86c061748dbf6ffbc1] [formerly abf56dec05 [formerly 983afa0eea]]
Former-commit-id: abf56dec05
Former-commit-id: a9d73bb3fa
|
2013-11-12 16:48:32 -06:00 |
|
Dave Hladky
|
5e49cb6411
|
Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: fda0e8261f [formerly 80ce7ec3e7] [formerly 5313c8b68d] [formerly 5313c8b68d [formerly 643a150777]] [formerly fda0e8261f [formerly 80ce7ec3e7] [formerly 5313c8b68d] [formerly 5313c8b68d [formerly 643a150777]] [formerly e3a259182c [formerly 5313c8b68d [formerly 643a150777] [formerly e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]]]
Former-commit-id: e3a259182c
Former-commit-id: bcff8fda2f [formerly b467763805] [formerly f2f670bc00] [formerly 233316cd9623243e93d01b95052261393cfb9276 [formerly a4fec8aeeb03e65d82a83a1808e0fa6530ced21e] [formerly f2f670bc00 [formerly 53866e481a]]]
Former-commit-id: fac1b723bce96f320231a2d9837f2256377da806 [formerly 454826e2ebc64df06b520cf75175b5fe9f328956] [formerly fa2238778d [formerly 86363574b3]]
Former-commit-id: fa2238778d
Former-commit-id: 6ee91eff8a
|
2013-11-12 14:55:41 -06:00 |
|
Nate Jensen
|
9cd9060969
|
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: 050c9798b8 [formerly 568e9dacba] [formerly edb2b6d217] [formerly edb2b6d217 [formerly 5e02427d6e]] [formerly 050c9798b8 [formerly 568e9dacba] [formerly edb2b6d217] [formerly edb2b6d217 [formerly 5e02427d6e]] [formerly c60228c854 [formerly edb2b6d217 [formerly 5e02427d6e] [formerly c60228c854 [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]]]
Former-commit-id: c60228c854
Former-commit-id: 5765a0b48b [formerly 8dacce7f9b] [formerly c6e10ebdef] [formerly bee5632d46b401a9612ae04e5a18a603a649cb70 [formerly 5dddfaa7f46782e5270d7070d02a28f1d2f20a01] [formerly c6e10ebdef [formerly a1315f1072]]]
Former-commit-id: 1b25a123beead07068c3a0679e10342d92a9119f [formerly 2e43027e215f7cefcc48aa4b0df6ded67da6bbd2] [formerly 73d6499cc0 [formerly a53cf1a079]]
Former-commit-id: 73d6499cc0
Former-commit-id: 03c16ff64b
|
2013-11-12 14:41:34 -06:00 |
|
Greg Armendariz
|
6ed521dceb
|
Issue #2512 - Remove dead code
Former-commit-id: bcc786cc9e [formerly b429bf2588] [formerly 59f8eb9341] [formerly 59f8eb9341 [formerly 4f4d59aa52]] [formerly bcc786cc9e [formerly b429bf2588] [formerly 59f8eb9341] [formerly 59f8eb9341 [formerly 4f4d59aa52]] [formerly 70c9a36826 [formerly 59f8eb9341 [formerly 4f4d59aa52] [formerly 70c9a36826 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]]]]
Former-commit-id: 70c9a36826
Former-commit-id: 176eb40240 [formerly 12dfecc863] [formerly f878a8e302] [formerly 3e1e1246d196b621425c2f7f1c86b45e29ade7c3 [formerly 1d7219743606de751141dfd69c8aab0a62160ea6] [formerly f878a8e302 [formerly fbcb810ab3]]]
Former-commit-id: 629d503255f2dd21af18137c66cf1a5208eac686 [formerly c2036e42c06dfb0f3938cd763917db7377259c64] [formerly bbd6cd614b [formerly 3852935abf]]
Former-commit-id: bbd6cd614b
Former-commit-id: df22d0db38
|
2013-11-12 14:20:21 -06:00 |
|
Richard Peter
|
df77afa64e
|
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: d0bb57d756 [formerly 8214774545] [formerly c25ba19514] [formerly c25ba19514 [formerly 9af1de07d4]] [formerly d0bb57d756 [formerly 8214774545] [formerly c25ba19514] [formerly c25ba19514 [formerly 9af1de07d4]] [formerly f12839a9e5 [formerly c25ba19514 [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]]]
Former-commit-id: f12839a9e5
Former-commit-id: bdc8c4587b [formerly 51f9a7fe54] [formerly 502d67591b] [formerly 527e59312e4159bee8a6b402d90cf26cedf4efa3 [formerly d63f1f5f4506e36003ebe3658bbae7045d51f7d9] [formerly 502d67591b [formerly c8ff79a7f5]]]
Former-commit-id: bad081d56bac464a58961e27d622dbfb1205edbe [formerly a6a02709b082eebc1c33d818028dc638fba6569a] [formerly 7855a8f000 [formerly 0cf51fce74]]
Former-commit-id: 7855a8f000
Former-commit-id: b4e255a976
|
2013-11-12 13:47:04 -06:00 |
|
Nate Jensen
|
38dcb65e6c
|
Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b
Former-commit-id: 58642ff23b [formerly 821c8d2a30] [formerly 6707d1aadf] [formerly 6707d1aadf [formerly 692ea76d75]] [formerly 58642ff23b [formerly 821c8d2a30] [formerly 6707d1aadf] [formerly 6707d1aadf [formerly 692ea76d75]] [formerly a4ece1d116 [formerly 6707d1aadf [formerly 692ea76d75] [formerly a4ece1d116 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]]]
Former-commit-id: a4ece1d116
Former-commit-id: f2a849b393 [formerly 25047d10d5] [formerly 4b329513e5] [formerly f14f0f0cb198624e97ad26bd133ab7d41f675371 [formerly bb48885fad4303574e632bfa0ef5cef5bf842c6d] [formerly 4b329513e5 [formerly 2e86520b53]]]
Former-commit-id: 0b46fb738fc46d8f41d919a22808981af220e4c4 [formerly fbb07670a286e23a919608b81c889cfa4b8bd22f] [formerly ec0025a309 [formerly 5c7be238a0]]
Former-commit-id: ec0025a309
Former-commit-id: 5e53b2d074
|
2013-11-12 13:02:49 -06:00 |
|
Nate Jensen
|
2d52a990f5
|
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: e369947576 [formerly 05068bb1f3] [formerly db61d36b4e] [formerly db61d36b4e [formerly 88af1ddfcb]] [formerly e369947576 [formerly 05068bb1f3] [formerly db61d36b4e] [formerly db61d36b4e [formerly 88af1ddfcb]] [formerly 64aa00bad6 [formerly db61d36b4e [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]]]
Former-commit-id: 64aa00bad6
Former-commit-id: 46d4ae7b93 [formerly f673de2e99] [formerly 7a5f716d70] [formerly f1613f167b4d5a60674c08e87dce1dd065d251cb [formerly 9e53a2808b9310818f353602936e9b93270e44e7] [formerly 7a5f716d70 [formerly 39679b0608]]]
Former-commit-id: 0d778a0253b3fd8d1659acb41c559e9e2dd8b9de [formerly 31537865a0c927339a6d678895ead733e422918e] [formerly db3a33864f [formerly f618186c69]]
Former-commit-id: db3a33864f
Former-commit-id: fddb55dc4d
|
2013-11-12 12:46:38 -06:00 |
|
Brad Gonzales
|
7d98685819
|
Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
Refactored notification sending in EdexBandwidthManager.
Fixed error in LifecycleManagerImpl refactor.
Added comment to isRecurringSubscription.
Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77
Former-commit-id: e2aa1fc62a [formerly 50fb18601c] [formerly 62e4cafa27] [formerly 62e4cafa27 [formerly 8f70fb1d0c]] [formerly e2aa1fc62a [formerly 50fb18601c] [formerly 62e4cafa27] [formerly 62e4cafa27 [formerly 8f70fb1d0c]] [formerly aea0e847aa [formerly 62e4cafa27 [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 25462e76ac [formerly 725742f4ec] [formerly 7747d901f7] [formerly 1eb187e9c46bd39ac3262a6fcee484349005c13f [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20] [formerly 7747d901f7 [formerly 866a11a9f0]]]
Former-commit-id: 2400ebcec42c1d260b541ed255e8227e56b4e7c6 [formerly 0b81bcbc6ab893fa04a28ec2f1a491d80e5eeec8] [formerly a626b240ce [formerly bad9b3242a]]
Former-commit-id: a626b240ce
Former-commit-id: 0aa3b220bf
|
2013-11-12 12:42:16 -06:00 |
|
Brian Clements
|
950bab7ff0
|
Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: 4c922fc5b8 [formerly e9b4f777e1] [formerly 9f7e85450d] [formerly 9f7e85450d [formerly 8b0e85f82c]] [formerly 4c922fc5b8 [formerly e9b4f777e1] [formerly 9f7e85450d] [formerly 9f7e85450d [formerly 8b0e85f82c]] [formerly 4050eb5f3e [formerly 9f7e85450d [formerly 8b0e85f82c] [formerly 4050eb5f3e [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]]]]
Former-commit-id: 4050eb5f3e
Former-commit-id: 17d28a8d54 [formerly 3351401cb6] [formerly 4d3c2f488c] [formerly 9f893fe005f9ece8e41341923fab5319ae55d323 [formerly 6cca22845871692e5d67bd3e6d781e22aab81c7d] [formerly 4d3c2f488c [formerly ba12c7467d]]]
Former-commit-id: 16f80c956242f1cb7c0832926a05e4a8f8bf8bd1 [formerly dc41493dc42e3f081d5a737dff2eb4134616deaa] [formerly b970c720de [formerly 94a9ea2ff0]]
Former-commit-id: b970c720de
Former-commit-id: 89f460969d
|
2013-11-12 12:41:50 -06:00 |
|
Nate Jensen
|
f0a70b9879
|
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: 62754f4abd [formerly 1747b23290] [formerly b71f2463da] [formerly b71f2463da [formerly 3f86a3735e]] [formerly 62754f4abd [formerly 1747b23290] [formerly b71f2463da] [formerly b71f2463da [formerly 3f86a3735e]] [formerly eed4c8604b [formerly b71f2463da [formerly 3f86a3735e] [formerly eed4c8604b [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]]]]
Former-commit-id: eed4c8604b
Former-commit-id: b01a2949c0 [formerly 0c999d40dd] [formerly b0600c60ce] [formerly 6b2decd63dfbe23a6d8d020c00a75b7e76b79497 [formerly e300fc5ad7ce2f811eabeaaee0fd88234f5a7008] [formerly b0600c60ce [formerly 18d790a423]]]
Former-commit-id: 2b09407c640493ba4f19000ab0eae82302388c9f [formerly 99218aaf830cc33d3e91fd60286e630f42edca21] [formerly 6185a257df [formerly 1f4af0c06a]]
Former-commit-id: 6185a257df
Former-commit-id: 361eb30aaf
|
2013-11-12 12:13:58 -06:00 |
|
Richard Peter
|
3a625dacb1
|
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 5350e6727b [formerly 7bd2cdb170] [formerly 4d82382054] [formerly 4d82382054 [formerly 8afc87e570]] [formerly 5350e6727b [formerly 7bd2cdb170] [formerly 4d82382054] [formerly 4d82382054 [formerly 8afc87e570]] [formerly 61fc3eba44 [formerly 4d82382054 [formerly 8afc87e570] [formerly 61fc3eba44 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]]]]
Former-commit-id: 61fc3eba44
Former-commit-id: ae2e1e8432 [formerly be32cf8237] [formerly d66aaa7746] [formerly 643fbf1091f1057e2f65b9c6c244f7de993de52c [formerly b49bd79f027e2a7d4129d4e1a9aa4cdf3f6a55d0] [formerly d66aaa7746 [formerly b8b01f6305]]]
Former-commit-id: ef0da5e5b8a6609f18f225926f9dc0a6d94a5c95 [formerly bf183aa6e0aa24b2877bc67aebb4d6c8dfeaed01] [formerly 24eb06f591 [formerly c60b0849b3]]
Former-commit-id: 24eb06f591
Former-commit-id: 680a54d2d5
|
2013-11-12 11:18:56 -06:00 |
|
Richard Peter
|
123f276fe4
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: bbcdf49b38 [formerly 061fa07147] [formerly 7ba466f5a6] [formerly 7ba466f5a6 [formerly 306bd6fae1]] [formerly bbcdf49b38 [formerly 061fa07147] [formerly 7ba466f5a6] [formerly 7ba466f5a6 [formerly 306bd6fae1]] [formerly 460a7b8b5d [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 26df6d6e8c [formerly 112816a54c] [formerly 3f68fc6eed] [formerly e4907f5885a36a91d1b65e6e0a89871cb695adee [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d] [formerly 3f68fc6eed [formerly 59671c1e7d]]]
Former-commit-id: 7f344e9740b2837f8eeb9555c3f79116a0bdd426 [formerly 8b93a7813019963981a150f64ec44daf5d188cde] [formerly ef23a8f65b [formerly c8ef435295]]
Former-commit-id: ef23a8f65b
Former-commit-id: ff729f46b5
|
2013-11-12 11:11:36 -06:00 |
|
Nate Jensen
|
38dcde5920
|
Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: a2802fa331 [formerly a1fadcf38f] [formerly 6c016a6bb6] [formerly 6c016a6bb6 [formerly 1ee5d91af2]] [formerly a2802fa331 [formerly a1fadcf38f] [formerly 6c016a6bb6] [formerly 6c016a6bb6 [formerly 1ee5d91af2]] [formerly 2cdc7e5e63 [formerly 6c016a6bb6 [formerly 1ee5d91af2] [formerly 2cdc7e5e63 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]]]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: 3222572db9 [formerly e2db59a055] [formerly 98cbafe95c] [formerly ef31d88c233cdbddbb1fdf988561e1a2b6e756c7 [formerly 62f6799a9e992798bc661107dd6e08c64c9810c5] [formerly 98cbafe95c [formerly 368d73449e]]]
Former-commit-id: 7c4b38dd27048fdf7f95d5292b87efbd6f41bd1d [formerly a37e5bc8d3f0a758722efebc08d2981f350a0deb] [formerly b92c73f16f [formerly 66ff41e961]]
Former-commit-id: b92c73f16f
Former-commit-id: 0c2d27c3ca
|
2013-11-12 11:03:51 -06:00 |
|
Dave Hladky
|
d18e36c49c
|
Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: e8c2873bcd [formerly af66d970dd] [formerly efa18426a1] [formerly efa18426a1 [formerly b6f1468b7e]] [formerly e8c2873bcd [formerly af66d970dd] [formerly efa18426a1] [formerly efa18426a1 [formerly b6f1468b7e]] [formerly 976eece1b1 [formerly efa18426a1 [formerly b6f1468b7e] [formerly 976eece1b1 [formerly de110d3747096601a122f64cc5d6037823213e92]]]]]
Former-commit-id: 976eece1b1
Former-commit-id: 8fa1dc517d [formerly 3d5ca2453b] [formerly 3f5b80e5b3] [formerly 88b59bc28546aba439559281eaa4529dfb978495 [formerly 18e585f452f18b7b112c96e0494390595d97c58e] [formerly 3f5b80e5b3 [formerly 753b36cfea]]]
Former-commit-id: b44c41eb817db9100e793f6a20339ad8c73bef11 [formerly 2fbe443c2e385e5f4ebf6922d2f5d909c21e1fcc] [formerly 6a9c0a6fa8 [formerly e410d1f44b]]
Former-commit-id: 6a9c0a6fa8
Former-commit-id: 5b4297b398
|
2013-11-12 10:58:50 -06:00 |
|
Nate Jensen
|
ae70b8bb2f
|
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: 00ae6ba189 [formerly 695f25ba66] [formerly 3480148f14] [formerly 3480148f14 [formerly bca5793e3d]] [formerly 00ae6ba189 [formerly 695f25ba66] [formerly 3480148f14] [formerly 3480148f14 [formerly bca5793e3d]] [formerly da8a858727 [formerly 3480148f14 [formerly bca5793e3d] [formerly da8a858727 [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]]]
Former-commit-id: da8a858727
Former-commit-id: 83e8b5b914 [formerly 493d79f524] [formerly ddebd81c73] [formerly b4a977ec327a562dcf4d106d5ec4d06144385db0 [formerly 9671b7375763905e318a2a92acb4933c27a059b8] [formerly ddebd81c73 [formerly d758e5ab57]]]
Former-commit-id: 062f0d676f2660c8ee4878d268dfc4c64519fe1b [formerly 58b849d5f1654c0d9121acbfd8935de1329365c0] [formerly 83c9d010c4 [formerly f1b25ed227]]
Former-commit-id: 83c9d010c4
Former-commit-id: 7cd003eda9
|
2013-11-12 10:55:40 -06:00 |
|
Brad Gonzales
|
3ad0d5fc9a
|
Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: 5d38d58358 [formerly 2cc78d880e] [formerly cbdb9dfb4f] [formerly cbdb9dfb4f [formerly cd221e5263]] [formerly 5d38d58358 [formerly 2cc78d880e] [formerly cbdb9dfb4f] [formerly cbdb9dfb4f [formerly cd221e5263]] [formerly ff5edde334 [formerly cbdb9dfb4f [formerly cd221e5263] [formerly ff5edde334 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]]]
Former-commit-id: ff5edde334
Former-commit-id: d1b181bcfa [formerly 66d22943ed] [formerly 1987184f87] [formerly ed5be04005d73564fe60a959df449344ecae9cfd [formerly 368a51ec44c83075967d0b8589b3b09c44ba8b74] [formerly 1987184f87 [formerly efdc64b7b3]]]
Former-commit-id: 5d3b1d3ec176b9c45febb66d51f33a31a75f0bc5 [formerly 4f74e3c469450a036eb47f21a5ab1ff474af8c5c] [formerly b7fca60f7d [formerly 1b084e4efa]]
Former-commit-id: c1b5a04bc040bc2a8e3182599e475054b4512384 [formerly b7fca60f7d]
Former-commit-id: 3c70ba2cb4
|
2013-11-12 10:50:06 -06:00 |
|
Nate Jensen
|
3d340cbff8
|
Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: 33ffd48e33 [formerly 881e9efc68] [formerly 74d7dfd7da] [formerly 74d7dfd7da [formerly 3054868350]] [formerly 33ffd48e33 [formerly 881e9efc68] [formerly 74d7dfd7da] [formerly 74d7dfd7da [formerly 3054868350]] [formerly d8f2ffbceb [formerly 74d7dfd7da [formerly 3054868350] [formerly d8f2ffbceb [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 54d23b2cb9 [formerly d1e5b5e0dc] [formerly 5899801877] [formerly e03bccfbaa5f2d9aa9a1b16b0ab445881a138dde [formerly 30a720690f9ddf9e80cde824f8524806bc0200e8] [formerly 5899801877 [formerly 68866c322c]]]
Former-commit-id: d1b6d059c3f6b76d3d567afae6f4a96b3bcb8382 [formerly 2f10d09e884cba80b4ac4bc61e8a1f5765b66353] [formerly 1ed84f8f63 [formerly f55aa5aea0]]
Former-commit-id: 1ed84f8f63
Former-commit-id: 7cc8abb191
|
2013-11-12 10:39:51 -06:00 |
|
Nate Jensen
|
92a0331da7
|
Merge "Issue #2539 added GZIP support to WFS REST" into development
Former-commit-id: ec0bbbb27d [formerly bf4406d124] [formerly cd5b0576b0] [formerly cd5b0576b0 [formerly f1b8eecca7]] [formerly ec0bbbb27d [formerly bf4406d124] [formerly cd5b0576b0] [formerly cd5b0576b0 [formerly f1b8eecca7]] [formerly 8c4608630d [formerly cd5b0576b0 [formerly f1b8eecca7] [formerly 8c4608630d [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]]]]
Former-commit-id: 8c4608630d
Former-commit-id: 9fc7ada626 [formerly d2f15c928c] [formerly f240b80d6f] [formerly 23b6dd620e743341c187beeb4e50b2db8d80ec10 [formerly 7d794297e4516fd184a29fd40a964387c686691f] [formerly f240b80d6f [formerly b87efc6860]]]
Former-commit-id: f0e465a326bf17bed8effe4b13cabea53c091d50 [formerly d7ddd5c3a83b55a35e8b7a2821a82a402fd86098] [formerly fd3fdf9b16 [formerly 81749eac08]]
Former-commit-id: fd3fdf9b16
Former-commit-id: bec280fb55
|
2013-11-12 10:39:44 -06:00 |
|
Nate Jensen
|
f0df9ac490
|
Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 6721ffcc10 [formerly 1174d22160] [formerly 2c0c20f01e] [formerly 2c0c20f01e [formerly b52bdb1cec]] [formerly 6721ffcc10 [formerly 1174d22160] [formerly 2c0c20f01e] [formerly 2c0c20f01e [formerly b52bdb1cec]] [formerly 7a73c65430 [formerly 2c0c20f01e [formerly b52bdb1cec] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]]]
Former-commit-id: 7a73c65430
Former-commit-id: 05e7786885 [formerly f91ac1953e] [formerly 9bf83be7e9] [formerly 7379c30f3be3deeff6c2343dcb40b8a3ace3b770 [formerly 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6] [formerly 9bf83be7e9 [formerly 5427e68fd2]]]
Former-commit-id: 39813de922366e56209ecd47f25a23ce7ebf297a [formerly 79abcb5632535338409c08045b873998da0ecaef] [formerly 273eb805c0 [formerly 80c38e1433]]
Former-commit-id: 9152f62bfa74a9c6b61b29001ba2f262b3e31235 [formerly 273eb805c0]
Former-commit-id: 40ea9ef7bc
|
2013-11-12 10:37:54 -06:00 |
|
Nate Jensen
|
84d2a564d5
|
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 95a26cfee5 [formerly 178e212c4b] [formerly 8ff0d1129a] [formerly 8ff0d1129a [formerly 3ed50ff500]] [formerly 95a26cfee5 [formerly 178e212c4b] [formerly 8ff0d1129a] [formerly 8ff0d1129a [formerly 3ed50ff500]] [formerly 23fe7de462 [formerly 8ff0d1129a [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]]]]
Former-commit-id: 23fe7de462
Former-commit-id: 58bdacdf0c [formerly d3cadd78d6] [formerly c84ff18213] [formerly 67e6f0b5dd04b2ab1bc3096ec898e59ba0ea261f [formerly bbd9ec0c716072ceca26f944c7f0c8aec819db11] [formerly c84ff18213 [formerly 90320ab47a]]]
Former-commit-id: dc2c43997c7290a2a8e79d5ce20a7224bf63b8d3 [formerly 045aa7ae34ea554793e18d0e4a7e5292445bcbfa] [formerly 47e4b7e7e6 [formerly da95b6f03e]]
Former-commit-id: ff9a5a607fa853be3ae32f53c6ab0ec3904b6778 [formerly 47e4b7e7e6]
Former-commit-id: 2a8ab782d9
|
2013-11-12 09:29:46 -06:00 |
|
Bryan Kowal
|
81fbbe4c62
|
Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number
Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0
Former-commit-id: fef0192743 [formerly d369a33bf0] [formerly 6b5f93117e] [formerly 6b5f93117e [formerly 8e1c0fb8eb]] [formerly fef0192743 [formerly d369a33bf0] [formerly 6b5f93117e] [formerly 6b5f93117e [formerly 8e1c0fb8eb]] [formerly 75e6914df1 [formerly 6b5f93117e [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]]]
Former-commit-id: 75e6914df1
Former-commit-id: 26a5db766a [formerly 5bfc4d4dda] [formerly 1a966d8ec2] [formerly e57a77fbe217b2fafb64cd88a9fbf1d74fc66f08 [formerly 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1] [formerly 1a966d8ec2 [formerly 5c38f0bfd6]]]
Former-commit-id: dda5f04cd2851f151770a770d7e0c6a696a6eae0 [formerly 4274b56b364d7382bd0a540b4a1fb3f80b4ad82e] [formerly adf5ac93ae [formerly 2565306c95]]
Former-commit-id: adf5ac93ae
Former-commit-id: 25bbbb75b1
|
2013-11-11 17:00:17 -06:00 |
|
Brian Clements
|
356d8f7234
|
Issue #2377 fixed error handling in QPF config
Former-commit-id: 11a0375699 [formerly 6faded726a] [formerly 23e9ac6aa8] [formerly 23e9ac6aa8 [formerly e2ac7ae212]] [formerly 11a0375699 [formerly 6faded726a] [formerly 23e9ac6aa8] [formerly 23e9ac6aa8 [formerly e2ac7ae212]] [formerly 684bd4dc50 [formerly 23e9ac6aa8 [formerly e2ac7ae212] [formerly 684bd4dc50 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]]]]
Former-commit-id: 684bd4dc50
Former-commit-id: 31e727942d [formerly 407884f08e] [formerly 368223de1f] [formerly 04d3ac3aaf8db11d08150854ed3c1def63083e82 [formerly a089b8911c036cdf25eb53efbf261c6116d81cf6] [formerly 368223de1f [formerly c6f8609b39]]]
Former-commit-id: 711979534f514c40ae0fbd3e6ce477b2ea876ecb [formerly 48b5dd3e522a5099b76c78644a592fbab63bcd8e] [formerly 39f4ee7d0d [formerly 6b051e1513]]
Former-commit-id: 39f4ee7d0d
Former-commit-id: f6bd71af1c
|
2013-11-11 16:18:16 -06:00 |
|
Nate Jensen
|
7636e9c654
|
Issue #2361 undo earlier changes that potentially break uengine based
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: e7adfa58a5 [formerly cf88b536e0] [formerly bb93c18e7d] [formerly bb93c18e7d [formerly 8628b7755e]] [formerly e7adfa58a5 [formerly cf88b536e0] [formerly bb93c18e7d] [formerly bb93c18e7d [formerly 8628b7755e]] [formerly a2935193b5 [formerly bb93c18e7d [formerly 8628b7755e] [formerly a2935193b5 [formerly 110cff66bb2cf847730562570a9415851e0362c2]]]]]
Former-commit-id: a2935193b5
Former-commit-id: b6666a2ecc [formerly e62a756cbc] [formerly e1138809e7] [formerly 69461a074065ff16c0ae8712073d36b1de87ab2a [formerly 32cf218a7d8218d000be9f55fd45198a966abf60] [formerly e1138809e7 [formerly 9dc69e316f]]]
Former-commit-id: 347addfccbbdd8edf128429c05904a434aed88c8 [formerly 3d8ba4a78981bc94ebb58b70b40e630f9143b086] [formerly cad09aed0b [formerly 5c30fd5b5c]]
Former-commit-id: cad09aed0b
Former-commit-id: bf6bd95340
|
2013-11-11 16:14:35 -06:00 |
|