4ef3874467
builder/virtualbox-*: seed RNG [GH-1386]
2014-09-02 09:35:59 -07:00
7549735bd3
Accept VirtualBox release candidate version (ex. 4.3.14_RC1 from 4.3.14_RC1r94870)
2014-07-12 19:08:10 +09:00
9eb32e5dcd
implement `iso_interface` setting
...
Adds a new configuration option, `iso_interface`, that can be set to
`sata` to mount the ISO on the SATA controller. Required for OS X.
2014-05-23 21:14:24 -04:00
e93697ab4e
builder/virtualbox-ovf,vmware-vmx: add `boot_command` support
...
Fixes #1082
2014-05-12 21:19:24 -07:00
d92179847d
provisioner/file: set file/directory permissions
...
fixes #1064
2014-05-09 21:03:35 -07:00
58fd5aec61
virtualbox: use local VBoxGuestAdditions.iso by default
...
fixes #1123
2014-05-06 16:15:55 -07:00
40150c376d
Fix http_files typo in comments
2014-05-06 17:13:15 +02:00
c2013bf680
virtualbox-ovf support for guest_additions_mode
...
Fixes #1035 "virtualbox-ovf" builder doesn't support "guest_additions_mode" option
2014-05-04 18:48:41 +02:00
38e880a187
Add ability to run vboxmanage commands just before exporting [GH-664]
2014-04-29 11:58:11 -07:00
eef3223f6c
Adding the ability to skip nat port forwarding for ssh connectivity
2014-04-29 08:27:23 +10:00
83add3969f
builder/virtualbox: fix deps
2014-04-26 12:27:30 -07:00
5fac6c79c4
fmt
2014-04-26 11:12:43 -07:00
e84e5e4f2c
Merge branch 'update-ssh-package' of github.com:higebu/packer into higebu-update-ssh-package
...
Conflicts:
builder/amazon/common/ssh.go
builder/digitalocean/ssh.go
builder/googlecompute/ssh.go
builder/openstack/ssh.go
communicator/ssh/communicator_test.go
communicator/ssh/keychain.go
communicator/ssh/keychain_test.go
2014-04-26 11:12:06 -07:00
850b066408
Merge pull request #945 from benlangfeld:feature/vb_output_opts (manually)
2014-04-21 08:38:48 -07:00
f087ce16dc
Fix the build problem by updating ssh package
2014-04-15 10:17:26 +09:00
27491f93f8
use old ssh code until higebu's branch is ready, see #1019
2014-04-11 08:23:12 -07:00
128f555a2c
Formatting
2014-03-14 13:22:49 -03:00
5b07e2604c
Fix export opts tests
2014-03-14 13:22:44 -03:00
8cf0e53b19
Properly apply templates to export opts
2014-03-14 13:22:32 -03:00
2cee7a5c10
Log export command being executed
2014-03-14 00:26:26 -03:00
bfd6755859
Move to an array of strings for a deterministic option separation
2014-03-14 00:12:50 -03:00
d1b41f2f14
Pass export_options individually to VBoxManage export
2014-03-13 23:33:35 -03:00
0332901f63
builder/virtualbox: Add an `export_opts` option
...
Allows arbitrary arguments to VBoxManage export, such as product info (--product, --vendor, etc).
2014-03-12 10:12:20 -03:00
239aabb554
builder/virtualbox: retry unregister a few times [GH-915]
2014-03-01 16:20:02 +01:00
ac2c4203a2
Add import_opts to the virtualbox-ovf builder. My use case is that I
...
have existing virtualbox virtual machines where I need to keep the mac
addresses so that the network interfaces come up when packer boots them.
Otherwise I just get SSH timeout and I'm unable to configure the machines.
2014-02-18 16:44:27 -08:00
430963f400
fmt
2014-01-19 19:30:11 -08:00
28286d2821
Fix tabs vs spaces
2014-01-13 00:03:10 -05:00
e4cfcb2a8a
Add more special scancodes
2014-01-10 12:40:43 -05:00
12938fe36b
builder/virtualbox,vmware: checksum not required if checksum type is
...
none
2014-01-04 11:10:13 -08:00
6d2e50e598
builder/virtualbox/ovf: fix shutdown_timeout handling
...
The shutdown_timeout config parameter was being ignored
(for both the user setting and the "5m" default) on the
virtualbox-ovf builder. As a result, packer complained
of timeouts on graceful shutdowns, and the build process
would error out. This fixes that along with some newly
created tests.
2013-12-31 18:28:33 -05:00
2b801a7b12
builder/vmware,virtualbox: checksum_type can be "none" [GH-471]
2013-12-28 09:59:47 -07:00
437dc12de3
builder/virtualbox/iso: load shutdown config [GH-754]
2013-12-26 23:28:15 -07:00
eeeaec3562
builder/vmware/vmx: StepCloneVMX
2013-12-26 08:34:27 -07:00
39d0600085
builder/virtualbox: fmt
2013-12-23 14:21:28 -08:00
c7bf38b63b
builder/virtualbox/common: only remove ISO if it was attached
2013-12-22 17:08:07 -08:00
473fe8a950
builder/virtualbox/ovf: instantiate the driver
2013-12-22 17:04:26 -08:00
c2b3fa732a
builder/virtualbox/ovf: validate source_path
2013-12-22 17:02:22 -08:00
e69bb1858c
builder/virtualbox/ovf: specify name for import
2013-12-22 15:24:24 -08:00
5b223f0798
builder/virtualbox/ovf: re-order some steps
2013-12-22 15:20:49 -08:00
dd767c9d54
builder/virtualbox/ovf: StepImport to import an OVF
2013-12-22 15:19:19 -08:00
0de7bb33cd
builder/virtualbox: set Tpl on VBoxManage
2013-12-22 11:57:05 -08:00
e51dde13ce
builder/virtualbox: tests for StepUploadVerison
2013-12-22 11:55:01 -08:00
5f1c597269
builder/virtualbox: StepUploadVersion
2013-12-22 11:50:29 -08:00
5feb7bce18
builder/virtualbox/common: Export
2013-12-22 10:40:39 -08:00
026bcd33fe
builder/virtualbox: StepRun common
2013-12-22 10:30:12 -08:00
fbd20dffcb
builder/virtualbox/common: StepRemoveDevices
2013-12-22 09:54:00 -08:00
b65559d888
builder/virtualbox: StepShutdown tests
2013-12-22 09:47:44 -08:00
67a87ce3e4
builder/virtualbox: StepShutdown
2013-12-22 09:37:27 -08:00
4bd2aa6106
builder/virtualbox: StepVBoxmanage
2013-12-22 09:24:29 -08:00
7a4ff3f2b1
builder/virtualbox: generic SSHConfig
2013-12-22 09:08:09 -08:00
79c0c6b545
builder/virtualbox: step attach floppy
2013-12-22 08:10:11 -08:00
d731dcd8f7
builder/virtualbox: floppy files config
2013-12-22 07:58:07 -08:00
598822d46b
builder/virtualbox/common: move outputdir config to common
2013-12-21 17:38:06 -08:00
886c0d3ad5
builder/virtualbox/common: StepSuppressMessages
2013-12-21 16:05:34 -08:00
db167c5a3d
builder/virtualbox/common: StepOutputDir
2013-12-21 15:20:15 -08:00
cdc02db96d
builder/virtualbox/common: Move Driver here
2013-12-21 15:00:48 -08:00
14eede264f
builder/virtualbox: add common package, common Artifact
2013-12-21 14:51:38 -08:00
afd67ea104
builder/virtualbox/iso: rename package
2013-12-21 14:27:00 -08:00
01c7bbf8c4
builder/virtualbox: move to iso/ folder
2013-12-21 14:25:22 -08:00
ac36b33f98
builder/virtualbox: fix compilation
2013-12-19 08:49:50 -08:00
3c5c9a6ea3
builder/virtualbox: sleep when stopping forcefully to allow session
...
unlock
2013-12-19 08:49:23 -08:00
dcae79e67f
builder/virtualbox: remove devices in separate step
2013-12-19 08:47:37 -08:00
c264ef0a29
builer/virtualbox: avoid crash since guest additions path not set
2013-12-18 11:27:25 -08:00
675f7a43ba
builder/virtualbox: don't download guest additions if disable [GH-731]
2013-12-18 11:22:02 -08:00
2920239e6e
builder/virtualbox: verify output dir is writable
2013-12-18 08:40:35 -08:00
d9c3aed479
builder/virtualbox: use VBOX_INSTALL_PATH to find VBoxManage
2013-11-19 12:32:10 -08:00
c1bd7468d5
builder/virtualbox: ctrl-c works during wait for boot
2013-11-12 16:19:38 +00:00
6c19ba621f
builder/virtualbox: no panic if ssh host port min/max is same [GH-594]
2013-11-04 14:20:26 -08:00
9acaa97a32
builder/virtualbox,vmware: warning if shutdown_command is not specified
2013-11-02 23:17:21 -05:00
a6150e6596
builder/all: update to warnings
2013-11-02 23:03:59 -05:00
aa95caa261
builder/virtualbox: allow disabling guest addition uploading
2013-11-02 11:34:54 +01:00
6620b9cc9b
Merge pull request #572 from ktruong7/format-issues1
...
Spelling mistake in comments
2013-10-28 06:52:57 -07:00
1f31ac1737
spelling mistake in comments
2013-10-24 14:46:54 -04:00
5e440fa4c1
Arguments Prefix (--) was missing for (data)portconfig
2013-10-23 15:05:00 +02:00
5e3c8c4fe6
builder/virtualbox,vmware: support user templates in SSH key path
...
[GH-539]
2013-10-20 15:58:39 -07:00
30be4927d6
builder/virtualbox: use proper SATA port arg [GH-547]
2013-10-20 15:55:31 -07:00
bb241af7b3
Formatted contributions
2013-10-09 13:14:09 -04:00
88e65ef59b
Moved the 1 sec timeout to the export step
2013-10-09 12:59:47 -04:00
8821ef4def
builder/virtualbox: detect vboxdrv issues [GH-488]
2013-10-02 17:13:22 -07:00
c19fcafc01
builder/virtualbox: error if version can't be detected [GH-488]
2013-10-02 17:11:42 -07:00
865f197503
builder/virtualbox: support attaching guest additions [GH-405]
2013-09-18 18:15:46 -07:00
692278965f
builder/virtualbox: fix scan codes
2013-09-15 23:41:08 -07:00
9f52b78602
fmt
2013-09-15 23:29:29 -07:00
efa401e4d2
Fix scancode comment concerning key release
...
According to the scancode reference, the release key code is generated by
adding `0x80` to the key press code, not `0x81`.
2013-09-15 23:18:55 -07:00
4952737ddb
Fix VirtualBox scancodes
...
Support for the backspace, delete and F1-F12 keys was added in commit 6028a3chttp://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
2013-09-15 21:45:11 -07:00
2a04f49bca
Using the vm_name parameter to name OVA/OVF files and their attachments
2013-09-06 23:38:31 -07:00
e732d86142
builder/virtualbox: process hdd interface as template, validate
2013-09-05 12:07:58 -07:00
dbc24d9357
Enable customization of VirtualBox disk controller with `hard_drive_interface` option (SATA only).
2013-09-05 11:00:08 -07:00
1a3620d77a
builder/virtualbox: new multistep API
2013-08-31 12:44:58 -07:00
a6735b1d65
builder/virtualbox: support ssh keys as auth mechanism [GH-70]
2013-08-27 22:55:13 -07:00
7647b12eab
builder/virtualbox: fmt
2013-08-19 16:24:29 -07:00
1fdaadb08c
website: document formats feature
2013-08-19 16:10:49 -07:00
a19bd564d3
builder/virtualbox: export to ovf or ova (default ovf)
2013-08-19 20:21:36 +02:00
64d87bfaf3
*: switch to packer ConfigTemplate
2013-08-15 19:17:23 -07:00
c0265d108a
builder/virtualbox: iso_urls for multiple ISO urls [GH-110]
2013-08-15 17:46:41 -07:00
0d152f541f
builder/virtualbox: remove unused function
2013-08-15 17:46:40 -07:00
562ea28a79
builder/virtualbox: switch download guest additions to use new common
2013-08-15 17:46:40 -07:00
bb352e5011
common: Add new StepDownload to DRY up downloads
2013-08-15 17:46:40 -07:00
71664cb34e
common: return -1 download percent if download hasn't started [GH-288]
2013-08-14 11:15:47 -04:00
0ba17a1a50
builder/virtualbox: Don't validate guest additions URL so early because it requires template
2013-08-14 09:59:09 -04:00
171ecaefa6
builder/virtualbox: guest-additions_url can use Version var [GH-272]
2013-08-13 22:11:15 -04:00
2d2eefcf33
builder/virtualbox: instantiate driver in Run method
2013-08-13 08:55:33 -07:00
332bdf6edc
builder/*, provisioner/*: set user vars
2013-08-09 15:57:08 -07:00
191520bc0b
builder/virtualbox: use new template processing stuff
2013-08-08 17:25:25 -07:00
5b7d8fbc74
rename builder/common to common since it is generally useful
2013-08-01 12:11:54 -07:00
558027465a
builder/virtualbox,vmware: retry removing output dir if fails
2013-07-31 15:16:39 -07:00
0363a1cdc2
builder/virtualbox,vmware: use DownloadableURL
2013-07-29 00:13:30 -07:00
ce5849308b
fmt
2013-07-25 20:49:39 -05:00
32eaa39a5f
Merge branch 'master' into jstamerj/windows
2013-07-25 09:31:02 -07:00
4ff0185add
Windows fixes
...
Strip carriage returns from end of lines in virtualbox/driver.go, fixing wait for virtualbox host shutdown.
Fix target upload directory path in communicator.go to use forward slashes. (When running on windows path/filepath returns backslashes...which does not work when the target host is unix).
2013-07-25 09:28:04 -07:00
56c3cbfb2a
builder/common: common config struct for Packer configs
2013-07-23 22:48:31 -05:00
56cf09f29e
builder/virtualbox: shutdown messages go to Ui
2013-07-23 22:42:39 -05:00
91c1bf0b8a
Merge pull request #204 from sit/builder-output-directory-error
...
builder/v*: Include path to output dir in error
2013-07-20 16:58:39 -07:00
d999d1c5dd
Merge pull request #205 from sit/preserve-cache-suffix
...
Preserve suffix of files put in the cache.
2013-07-20 16:40:31 -07:00
e84811e2f8
Update changelog
2013-07-20 16:37:48 -07:00
dbd45dfd58
Add special keys for backspace, delete and F1-F12
2013-07-20 15:37:01 -04:00
329266e86e
builder/v*: Include path to output dir in error
2013-07-20 00:36:59 -04:00
e171477e15
Revert "builder/virtualbox: Copy ISO because VirtualBox can't recognize"
...
This reverts commit 688be43811007d33b9c70dec93b43782a4f71c06; instead
of copying the ISO (which can be huge), we have adjusted the cache path
to include the extension of the source file.
Conflicts:
builder/virtualbox/step_download_iso.go
2013-07-20 00:26:46 -04:00
16d102d055
builder/*: switch to MultiErrorAppend
2013-07-19 19:08:25 -04:00
42059f9b07
builder/*: extract to common the config decoding
2013-07-19 15:00:32 -04:00
8e1e40c096
builder/*: convert to common StepProvision
2013-07-16 15:44:41 +09:00
979bfc412e
builder/virtualbox: use common SSH connect step
2013-07-15 14:17:09 +09:00
9387ba0fd4
packer: Make builder type available in configs [GH-154]
2013-07-15 09:58:32 +09:00
16960a52f2
builder/virtualbox: unexport calculated fields
2013-07-14 21:22:11 +09:00
a0f1667df1
communicator/ssh: tweakable timeout on retry connection
2013-07-14 21:05:22 +09:00
9718a4656c
communicator/ssh: have a Connection func so we can re-establish
...
[GH-152]
2013-07-14 20:22:57 +09:00
3007498282
builder/virtualbox: support generic hash types [GH-175]
2013-07-14 15:50:34 +09:00
3b4ef72e47
Unused keys are invalid in templates [GH-104]
2013-07-14 09:28:56 +09:00
245deaf599
buidler/virtualbox,vmware: only stat if not force
...
/cc @jasonberanek - Swapped this because why even bother doing a stat
if we're forcing anyways.
2013-07-13 14:47:08 +09:00
9c31c69a7b
Remove output directory in a step when "-force" flag step [GH-178]
2013-07-12 21:23:00 -05:00
2981da4eef
fmt
2013-07-13 10:01:27 +09:00
13c733a3db
Add support for -force flag on builds [GH-119]
2013-07-11 23:43:23 -05:00
2ad30e1ea1
builder/virtualbox: paused is still running
2013-07-09 12:41:36 -07:00
dbad270d27
builder/virtualbox: remove floppy drive before exporting
2013-07-09 12:41:36 -07:00
45c47e64fa
builder/virtualbox: support floppy_files
2013-07-09 12:41:36 -07:00
019ab13f53
builder/virtualbox: whitespace
2013-07-07 18:04:30 -07:00
f83ec95928
builder/virtualbox: style nitpicks and CHANGELOG
2013-07-07 09:17:27 -07:00
1e7508c828
fmt
2013-07-07 09:14:41 -07:00
f8617b2641
builder/virtualbox: test the configuration
...
/cc @sgirones
2013-07-07 09:14:16 -07:00
d289a6a850
builder/virtualbox: typo in test
2013-07-07 09:09:22 -07:00
509712c4a4
Merge pull request #145 from sgirones/feature/local-mode-guest-additions
...
builder/virtualbox: Local mode for VBoxGuestAdditions. Provide local path and SHA256
2013-07-07 09:07:56 -07:00
babd47541b
Local mode for VBoxGuestAdditions. Provide local path and SHA256
2013-07-06 11:28:56 +02:00
1a2e4f9d0b
fmt
2013-07-05 11:00:18 -07:00
6cdc938f46
Virtualbox: clean up port forwarding before exporting OVF.
2013-07-04 14:46:39 -07:00
c5258c5422
Typo
2013-07-03 19:11:37 -04:00
50095283ef
builder/virtualbox, builder/vmware: keyboard-interactive [GH-121]
2013-07-02 22:02:58 -07:00
2b010269a3
builder/virtualbox: Warning about headless mode
...
/cc @smerrill
2013-07-02 12:20:26 -07:00
67920da4ec
Merge pull request #108 from smerrill/headless-mode
...
builder/vmware, builder/virtualbox: Headless mode
2013-07-02 12:16:40 -07:00
471f33d02e
Add wait5 and wait10 special keys for boot command.
2013-07-02 10:31:22 -07:00
2aeb756a56
Add VirtualBox headless mode.
2013-07-02 00:13:24 -04:00
bac976332f
builder/virtualbox, builder/vmware: output and VM name based on build
...
[GH-91]
2013-07-01 11:11:51 -07:00
9cf78edcf0
builder/virtualbox: trim whitespace when getting version
2013-07-01 10:59:04 -07:00
b317c763ac
builder/virtualbox: add more logging to version detection
2013-06-29 13:45:30 -07:00
daac8b959f
builder/common: Fix nil deref on race condition [GH-52]
...
When verifying large files, the checksum would take a long time and
downloader would be nil. When the goroutine asked for progress,
it would raise a nil exception.
2013-06-28 22:34:43 -04:00
8aaadf354a
builder/virtualbox,vmware: work if port range for HTTP is 0 [GH-53]
2013-06-28 22:00:01 -04:00
30fadde297
builder/virtualbox: Tests for the defaults [GH-44]
2013-06-28 16:01:50 -04:00
4abd1c22c1
builder/virtualbox: Set the default boot_wait [GH-44]
2013-06-28 16:01:50 -04:00
0eea40bad9
builder/virtualbox: close the input source ISO
2013-06-28 10:30:33 -04:00
620a864c49
builder/virtualbox: check the proper file path
2013-06-28 09:45:30 -04:00
2f98ab2018
builder/virtualbox: return if cancelled, to avoid nil deref
2013-06-27 22:24:53 -04:00
98b4761ef1
builder/virtualbox, vmware: delete output dir if cancelled
2013-06-27 22:23:40 -04:00
1400d20bb9
builder/virtualbox: Error if output directory already exists
2013-06-27 22:14:23 -04:00
8a609b67c1
builder/*: Fail if provisioning fails [GH-33]
2013-06-26 17:54:57 -07:00
9786986a72
fmt
2013-06-25 14:31:06 -05:00
41f4ce56a5
builder/virtualbox: "stopping" is still running [GH-30]
2013-06-24 09:32:08 -07:00
1f57d722ff
builder/virtualbox: remap versions that don't have guest additions
2013-06-24 09:24:16 -07:00
1931c98fff
builder/virtualbox: checksum the guest additions
2013-06-23 23:44:03 -07:00
27c9e8cf92
builder/virtualbox: treat guest_additions_path as a template
2013-06-23 23:14:19 -07:00
a599074185
builder/virtualbox: upload guest additions to VM
2013-06-23 23:09:52 -07:00
921770b611
builder/virtualbox: Download guest additions for the VM
2013-06-23 23:05:32 -07:00
e91421b1e1
website: update docs for virtualbox_version_file
2013-06-23 22:46:57 -07:00
85c83cbf58
builder/virtualbox: Upload version to a "virtualbox_version_file"
2013-06-23 22:44:58 -07:00
0f376457e3
builder/virtualbox: only power off the machine if it isrunning
2013-06-23 22:00:40 -07:00
bdd60fe914
builder/virtualbox: Message for vboxmanage command, not say
2013-06-23 21:56:14 -07:00
eacf257d83
builder/virtualbox: recognize <tab>
2013-06-23 21:50:16 -07:00
15f191deb0
builder/virtualbox: Copy ISO because VirtualBox can't recognize
2013-06-23 21:47:56 -07:00
d52cd1ed83
builder/virtualbox: Output VBoxManage stderr in error
2013-06-23 21:19:41 -07:00
a3bd9ecdc3
builder/virtualbox: add "vboxmanage" to run custom commands
2013-06-23 20:58:22 -07:00
72741dbe3a
builder/virtualbox: Ability to set DiskSize
2013-06-23 20:43:40 -07:00
a3c5fed267
builder/vmware, builder/virtualbox: Don't continue if ISO error
2013-06-23 18:23:00 -07:00
70c4753f77
fmt
2013-06-19 21:20:54 -07:00
64aed2b34a
builder/virtualbox: proper artifact [GH-23]
2013-06-19 21:12:11 -07:00
b8103ff9c0
builder/virtualbox: properly handle errors
2013-06-19 21:07:53 -07:00
f754c171e8
builder/*: Add support for debug
2013-06-15 10:51:09 -07:00
a6194467ac
builder/*: Adhere to the new interface
2013-06-14 12:29:48 -07:00
4daefc2588
fmt
2013-06-13 10:24:10 -07:00
760995dba1
builder/virtualbox: say when forcefully shutting down
2013-06-12 18:19:29 -07:00
6516e5a627
builder/virtualbox: export
2013-06-12 18:07:08 -07:00
48a3892ce6
builder/virtualbox: graceful shutdown
2013-06-12 18:02:42 -07:00
52391bb1f3
builder/virtualbox: Use the common downloader
2013-06-12 17:42:18 -07:00
521b59a6fa
Make everything support the new builder interface
2013-06-12 16:06:56 -07:00
e101b031fc
builder/virtualbox: Cancel mid-type if we can
2013-06-12 10:47:55 -07:00
574286bdd6
builder/virtualbox: provision step
2013-06-12 08:47:36 -07:00
c58d5ab3af
builder/virtualbox: time out on SSH handshake for retry
2013-06-12 00:54:25 -07:00
5c0d8ecd72
builder/virtualbox: Wait for SSH to become available
2013-06-12 00:41:58 -07:00
e7cc350536
builder/virtualbox: scancode reference
2013-06-12 00:27:31 -07:00
7344d9e52c
builder/virtualbox: type boot command
2013-06-12 00:26:08 -07:00
c7071b3bd2
builder/virtualbox: http server for local files
2013-06-11 23:44:40 -07:00
e7aa9b409c
builder/virtualbox: add boot_command
2013-06-11 21:08:45 -07:00
9e4a5a227b
builder/virtualbox: support boot_wait
2013-06-11 20:56:44 -07:00
Mitchell Hashimoto
Hiroaki Nakamura
Matt Behrens
Ross Smith II
Jakob A. Dam
Rickard von Essen
Jacob Helwig
Peter Leschev
higebu
Ben Langfeld
Brian Johnson
Myles Steinhauser
Greg Lu
Matthew Hooker
ktruong7
Fabian Grutschus
Lyndon Washington
Charlie Sharpsteen
Sean Mackrory
Justin Bronn
Johan Siebens
Jeff Stamerjohn
JD Harrington
Emil Sit
Jason A. Beranek
Salvador Gironès
Brandon Liu
Geoffrey Bachelet
Steven Merrill