rapid7 / propsd

98%

master: 98%

LAST BUILD ON BRANCH fix-allows-layers-with-undefined-properties

branch: fix-allows-layers-with-undefined-properties

CHANGE BRANCH

x

Reset

• fix-allows-layers-with-undefined-properties
• PD-20473-separate-cache-for-previous-properties
• PD-20473-store-previous-properties
• PD-8222_capitalize_Propsd
• PD-8301_locking_versions
• add-1604-support
• add-coveralls-support
• add-docker-build
• allow-upstream-version-override
• breaking-changes-inminor-releases-ftw
• bug-layer-ordering-gets-reversed
• bug-layer-ordering-reversed
• bug-removed-config-file-should-trigger-s3-source-shutdown
• bug-reversed-layer-ordering
• bug-tokendtransformer-caching
• bump-builderator-version
• bump-node-version
• bump-ruby-version-to-230
• color-support-for-logger
• consul-source-only-uses-service-name
• consul-source-should-not-be-loaded-by-default
• cookbook
• cookbook-guard-symlink
• cookbook-specify-package-version
• dependabot/bundler/rack-1.6.12
• dependabot/bundler/rake-12.3.3
• dependabot/npm_and_yarn/eslint-4.18.2
• dependabot/npm_and_yarn/fstream-1.0.12
• dependabot/npm_and_yarn/handlebars-4.1.2
• dependabot/npm_and_yarn/handlebars-4.5.3
• dependabot/npm_and_yarn/handlebars-4.7.6
• dependabot/npm_and_yarn/ini-1.3.7
• dependabot/npm_and_yarn/is-my-json-valid-2.20.0
• dependabot/npm_and_yarn/sshpk-1.16.1
• dependabot/npm_and_yarn/stringstream-0.0.6
• dependabot/npm_and_yarn/tough-cookie-2.3.4
• diagrams
• docs-devopsdays-nyc-2016
• enhancement-log-granularity
• eslint-and-doc-improvements
• expose-propsd-version-in-cookbook-node-attribute
• feature-add-datakey-field-to-tokend-transformer
• feature-add-version-property-to-health-endpoint
• feature-configuration-guide
• feature-debian-package-should-recommend-node
• feature-debug-task
• feature-document-consul-config
• feature-ec2-tags-source
• feature-flag
• feature-get-specific-property
• feature-improve-logging
• feature-installation-guide
• feature-merge-secrets-from-tokend
• feature-metadata-source-gets-asg-info
• feature-package-default-config-file
• feature-parse-secrets-from-tokend
• feature-readme-marketing-blurb
• feature-request-logging
• feature-retrieve-specific-property
• feature-transit-secret-provider
• feature-update-status-code-based-on-property-set-state
• feature-usage-guide
• fix-add-tokend-caching
• fix-asg-source-requests-too-much-data
• fix-better-conqueso-compatibility
• fix-better-logic-around-source-reloading
• fix-cache-properites-when-index-rebuilds
• fix-can-merge-consul-plugin-properties
• fix-code-coverage
• fix-conqueso-diff-property-parsing
• fix-consul-polling
• fix-consul-source-conqueso-compat
• fix-consul-source-should-not-be-shutdown-on-index-update
• fix-cookbook-version-helper
• fix-delete-ec2metadata-from-conqueso-api
• fix-deprecate-config-service
• fix-empty-property-returns-null-instead-of-missing
• fix-faster-tokend-integration-tests
• fix-keep-index-sources-ordered
• fix-logging-levels
• fix-metadata-failure-crashing-process
• fix-more-storage-unregistration-tests
• fix-namespaced-consul-properties
• fix-no-colored-logs
• fix-node-version
• fix-npm-install-flag
• fix-ordering-ips-in-conqueso-diff
• fix-pluginmanager-todo-tests
• fix-propsd-symlink-permissions
• fix-propsd-version-in-cookbook
• fix-release-upload-mime-type-detection
• fix-remove-colored-output
• fix-remove-ec2metadata-output
• fix-remove-translated-consul-properties
• fix-rename-all-the-things
• fix-s3-etag-caching
• fix-tag-source-is-not-nested
• fix-transit-timing-test
• fix-travis-test-timeout-latency
• fix-version-constraint-on-deb-recommends
• fixup-ohai-plugin
• gem-groups
• github-release-task
• handle-undefined-parameter
• implement-babel
• implement-kms-type-for-tokend-transformer
• implement-yarn
• improve-test-coverage
• luxor
• make-cookbook-idempotent
• make-rakefile-great-again
• make-tags-source-tuneable
• master
• metadata-redux
• metadata-tests
• normalize-log-format
• properties-merge
• properties-module
• propsd-plugin
• propsd-user-has-too-many-privileges
• quickfix-metadata-should-not-poll
• quickfix-metadata-should-not-poll-rebased
• rakefile-fix
• readmeupdates
• release-1.2.2
• remove-unneeded-gitkeeps
• remove-upstart-notifies-restart
• resolve-sources-update
• server-side-encryption-for-s3-upload
• ship-early-ship-often
• source-cleanup
• sources-test
• support-instance-role
• ubuntu1804
• udangel-r7-patch-1
• update-dependencies
• update-dev-dependencies
• update-eslint-and-rules
• update-node-installation-method
• update-rakefile-to-recommend-nodejs
• update-to-node-8-build-env
• update_propsd_s3_client_to_enable_irsa
• updating_propsd_health_check_to_reflect_initialising_state
• upgrade-to-chef-14-and-ubuntu-1804
• use-rake-clean
• v1.0.0
• v1.1.0
• v1.2.0
• v1.2.1
• v1.2.2
• v1.2.3
• v1.2.4
• v1.2.5
• v1.2.6
• v1.2.7
• v1.2.8
• v1.3.0
• v1.3.1
• v1.4.0
• v1.4.1
• v1.4.2
• v1.4.3
• v1.4.4
• v1.4.5
• v1.5.0
• v2.0.0
• v2.1.0
• v2.2.0
• v2.3.0
• v2.4.0
• v3.0.0
• v3.0.1
• v3.0.2
• v3.0.3
• v3.1.0
• v3.1.2
• v3.1.3

Build # 758

Build Type

push

travis-ci

Committed by onefrankguy

Commit Message

Have merge always return an Object.

Run Details

637 of 653 relevant lines covered (97.55%)

18.94 hits per line